H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Directly calling git commands

Browse Source
This commit is contained in:
Marwolf
2018-07-14 20:43:31 -04:00
parent a24a402065
commit 6b5455576d
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -33,15 +33,6 @@ clone-windows-game:
clone-windows-wiki: clone-windows-wiki:
@git clone https://github.com/Open-RSC/Wiki.git Website/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: pull-game-windows:
@cd Game && git reset HEAD --hard && git pull @cd Game && git reset HEAD --hard && git pull

12
Setup_Linux_Mac.sh
View File

@@ -292,7 +292,7 @@ if [ "$choice" == "1" ]; then
echo "" echo ""
echo "You may now be prompted for your password so the installer has sudo access." echo "You may now be prompted for your password so the installer has sudo access."
echo "" echo ""
sudo make pull-game cd Game && git reset HEAD --hard && git pull
echo "" echo ""
echo "" echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."
@@ -339,9 +339,9 @@ elif [ "$choice" == "2" ]; then
echo "" echo ""
echo "You may now be prompted for your password so the installer has sudo access." echo "You may now be prompted for your password so the installer has sudo access."
echo "" echo ""
sudo make pull-game cd Game && git reset HEAD --hard && git pull
echo "" echo ""
sudo make pull-website cd Website && git reset HEAD --hard && git pull
echo "" echo ""
echo "" echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."
@@ -390,11 +390,11 @@ elif [ "$choice" == "3" ]; then
echo "" echo ""
echo "You may now be prompted for your password so the installer has sudo access." echo "You may now be prompted for your password so the installer has sudo access."
echo "" echo ""
sudo make pull-game cd Game && git reset HEAD --hard && git pull
echo "" echo ""
sudo make pull-website cd Website && git reset HEAD --hard && git pull
echo "" echo ""
sudo make pull-wiki cd Website/Wiki && git reset HEAD --hard && git pull
echo "" echo ""
echo "" echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."