diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79c5c926..e0d6abaa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ - A working up-to-date cathook installation - C++ knowledge - Git knowledge -- Ability to ask for help (Feel free to create empty pull-request or PM a maintainer in [Telegram](https://t.me/nullifiedcat)) +- Ability to ask for help (Feel free to create empty pull-request or PM a maintainer in [Telegram](https://t.me/nullworks)) ### Setting up cathook @@ -17,7 +17,7 @@ The easiest way to undo this is by running the `developer` script located in `sc In order to send code back to the official cathook repository, you must first create a copy of cathook on your github account ([fork](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)) and then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) back to cathook. -All cathook developement is usually performed on the `testing` branch. Please make sure to submit your pull request to that branch. +Cathook developement is performed on multiple branches. Changes are then pull requested into master. By default, changes merged into master will not roll out to stable build users unless the `stable` tag is updated. ### Code-Style diff --git a/scripts/updater b/scripts/updater index bde20c39..1b9fdd57 100755 --- a/scripts/updater +++ b/scripts/updater @@ -80,7 +80,7 @@ function performupdate() { update_channel="$(cfg_read $configfile update_channel)" if [ "$update_channel" == "stable" ]; then - git fetch --force --depth 1 origin refs/tags/latest:refs/tags/latest && git reset --hard latest || { echo -e "\033[1;33m\nFailed to pull from github! Trying alternative pull (legacy)\n\033[0m"; git fetch --depth 1 && git reset --hard @{upstream} || { echo -e "\033[1;31m\nFailed to pull from github! A reinstall is recommended. https://github.com/nullworks/cathook\n\033[0m"; exit 1; } } + git fetch --force --depth 1 origin refs/tags/stable:refs/tags/stable && git reset --hard stable || { echo -e "\033[1;33m\nFailed to pull from github! Trying alternative pull (legacy)\n\033[0m"; git fetch --depth 1 && git reset --hard @{upstream} || { echo -e "\033[1;31m\nFailed to pull from github! A reinstall is recommended. https://github.com/nullworks/cathook\n\033[0m"; exit 1; } } elif [ "$update_channel" == "master" ]; then git fetch --force --depth 1 origin && git reset --hard origin/master || { echo -e "\033[1;33m\nFailed to pull from github! Trying alternative pull (legacy)\n\033[0m"; git fetch --depth 1 && git reset --hard @{upstream} || { echo -e "\033[1;31m\nFailed to pull from github! A reinstall is recommended. https://cathook.club\n\033[0m"; exit 1; } } elif [ "$update_channel" == "developer" ]; then