Force git pull before push

NEMSLinux · Oct 26, 2018 · 693a769 · 693a769
1 parent 116fead
commit 693a769
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/nems-push.sh b/nems-push.sh
@@ -9,6 +9,7 @@ read -s -p "Github Password: " password
 cd /root/nems/nems-admin
 echo ""
 pwd
+git pull
 git add *
 git commit -am "$comment"
 #git push origin master
@@ -17,6 +18,7 @@ git push "https://Cat5TV:$password@github.com/Cat5TV/nems-admin.git"
 cd /usr/local/share/nems/nems-scripts/
 echo ""
 pwd
+git pull
 git add *
 git commit -am "$comment"
 #git push origin master
@@ -25,6 +27,7 @@ git push "https://Cat5TV:$password@github.com/Cat5TV/nems-scripts.git"
 cd /var/www/html/
 echo ""
 pwd
+git pull
 git add *
 git commit -am "$comment"
 #git push origin master
@@ -33,6 +36,7 @@ git push "https://Cat5TV:$password@github.com/Cat5TV/nems-www.git"
 cd /root/nems/nems-migrator/
 echo ""
 pwd
+git pull
 git add *
 git commit -am "$comment"
 #git push origin master
@@ -41,6 +45,7 @@ git push "https://Cat5TV:$password@github.com/Cat5TV/nems-migrator.git"
 cd /var/www/nconf/
 echo ""
 pwd
+git pull
 git add *
 git commit -am "$comment"
 #git push origin develop
@@ -50,6 +55,7 @@ if [[ -d /root/nems/nems-tools ]]; then
   cd /root/nems/nems-tools
   echo ""
   pwd
+  git pull
   git add *
   git commit -am "$comment"
   #git push origin master