INSTALL: making sure Git disregard any rebase default behavior to keep the up-to-date message consistent

Author: Commit-La-Grenouille

install.sh

@@ -76,7 +76,8 @@ if [ $upgrade -eq 1 -a $makerfaire2018 -eq 0 -a -d ${home_dir}/wm8960 ]; then
   echo "Updating sound driver - 2/14" > /tmp/pynab.upgrade
   cd ${home_dir}/wm8960
   sudo chown -R ${owner} .git
-  pull=$(LANGUAGE=en git pull)
+  # Making sure we keep the up-to-date status message consistent no matter the rebase default behavior
+  pull=$(LANGUAGE=en git pull --no-rebase)
   if [ "$pull" == "Already up to date." ]; then
     echo "Sound driver is already up-to-date..."
   else
@@ -90,7 +91,8 @@ if [ $upgrade -eq 1 ]; then
   if [ -d ${home_dir}/tagtagtag-ears ]; then
     cd ${home_dir}/tagtagtag-ears
     sudo chown -R ${owner} .git
-    pull=$(LANGUAGE=en git pull)
+    # Making sure we keep the up-to-date status message consistent no matter the rebase default behavior
+    pull=$(LANGUAGE=en git pull --no-rebase)
     if [ "$pull" == "Already up to date." ]; then
       echo "Ears driver is already up-to-date..."
     else
@@ -116,7 +118,8 @@ if [ $upgrade -eq 1 ]; then
   if [ -d ${home_dir}/cr14 ]; then
     cd ${home_dir}/cr14
     sudo chown -R ${owner} .git
-    pull=$(LANGUAGE=en git pull)
+    # Making sure we keep the up-to-date status message consistent no matter the rebase default behavior
+    pull=$(LANGUAGE=en git pull --no-rebase)
     if [ "$pull" == "Already up to date." ]; then
       echo "RFID driver is already up-to-date..."
     else
@@ -141,8 +144,9 @@ if [ $upgrade -eq 1 ]; then
   echo "Updating NabBlockly - 5/14" > /tmp/pynab.upgrade
   if [ -d ${root_dir}/nabblockly ]; then
     cd ${root_dir}/nabblockly
-    sudo chown -R ${owner} .
-    pull=$(LANGUAGE=en git pull)
+    sudo chown -R ${owner}
+    # Making sure we keep the up-to-date status message consistent no matter the rebase default behavior
+    pull=$(LANGUAGE=en git pull --no-rebase)
     if [ "$pull" == "Already up to date." ]; then
       echo "NabBlockly is already up-to-date..."
     else

upgrade.sh

@@ -25,17 +25,17 @@ case $step in
     done
     sudo systemctl stop nabd.socket || echo -n ""
     sudo systemctl stop nabd.service || echo -n ""
-  
+
     sudo -u ${owner} touch /tmp/pynab.upgrade
     sudo chown ${owner} /tmp/pynab.upgrade
     echo "Updating code - 1/?" > /tmp/pynab.upgrade
     cd ${root_dir}
     if [[ $EUID -ne ${ownerid} ]]; then
-      sudo -u ${owner} git pull
+      sudo -u ${owner} git pull --no-rebase
     else
-      git pull
+      git pull --no-rebase
     fi
-  
+
     bash upgrade.sh "install"
     ;;
   "install")