diff --git a/Makefile b/Makefile index fb4d340..2321581 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,6 @@ clone-windows-game: clone-windows-wiki: @git clone https://github.com/Open-RSC/Wiki.git Website/Wiki -pull-game: - @$(shell cd Game && git reset HEAD --hard && git pull) - -pull-website: - @$(shell cd Website && git reset HEAD --hard && git pull) - -pull-wiki: - @$(shell cd Website/Wiki && git reset HEAD --hard && git pull) - pull-game-windows: @cd Game && git reset HEAD --hard && git pull diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh index 693f85c..9675ebc 100755 --- a/Setup_Linux_Mac.sh +++ b/Setup_Linux_Mac.sh @@ -292,7 +292,7 @@ if [ "$choice" == "1" ]; then echo "" echo "You may now be prompted for your password so the installer has sudo access." echo "" - sudo make pull-game + cd Game && git reset HEAD --hard && git pull echo "" echo "" echo "Logging into Docker Hub to get the required images." @@ -339,9 +339,9 @@ elif [ "$choice" == "2" ]; then echo "" echo "You may now be prompted for your password so the installer has sudo access." echo "" - sudo make pull-game + cd Game && git reset HEAD --hard && git pull echo "" - sudo make pull-website + cd Website && git reset HEAD --hard && git pull echo "" echo "" echo "Logging into Docker Hub to get the required images." @@ -390,11 +390,11 @@ elif [ "$choice" == "3" ]; then echo "" echo "You may now be prompted for your password so the installer has sudo access." echo "" - sudo make pull-game + cd Game && git reset HEAD --hard && git pull echo "" - sudo make pull-website + cd Website && git reset HEAD --hard && git pull echo "" - sudo make pull-wiki + cd Website/Wiki && git reset HEAD --hard && git pull echo "" echo "" echo "Logging into Docker Hub to get the required images."