From 5a5a950ad5c83db512e7611f5d49ea487f0e4653 Mon Sep 17 00:00:00 2001
From: Commit La Grenouille <dr_no7@caramail.com>
Date: Sun, 20 Mar 2022 13:28:10 +0100
Subject: [PATCH] INSTALL: making sure the git clone status checks are
 predictable no matter the locale defined + keeping all git calls immune to
 explicit rebase config

---
 install.sh | 12 ++++++++----
 upgrade.sh |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index 13edc20b..6026ca50 100755
--- a/install.sh
+++ b/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=`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
     make && sudo make install && make clean
     sudo touch /tmp/pynab.upgrade.reboot
@@ -88,7 +89,8 @@ if [ $upgrade -eq 1 ]; then
   if [ -d ${home_dir}/tagtagtag-ears ]; then
     cd ${home_dir}/tagtagtag-ears
     sudo chown -R ${owner} .git
-    pull=`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
       make && sudo make install && make clean
       sudo touch /tmp/pynab.upgrade.reboot
@@ -112,7 +114,8 @@ if [ $upgrade -eq 1 ]; then
   if [ -d ${home_dir}/cr14 ]; then
     cd ${home_dir}/cr14
     sudo chown -R ${owner} .git
-    pull=`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
       make && sudo make install && make clean
       sudo touch /tmp/pynab.upgrade.reboot
@@ -136,7 +139,8 @@ if [ $upgrade -eq 1 ]; then
   if [ -d ${root_dir}/nabblockly ]; then
     cd ${root_dir}/nabblockly
     sudo chown -R ${owner} .
-    pull=`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
       ./rebar3 release
     fi
diff --git a/upgrade.sh b/upgrade.sh
index 5a904280..33f0231f 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -25,7 +25,7 @@ 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
@@ -35,7 +35,7 @@ case $step in
     else
       git pull
     fi
-  
+
     bash upgrade.sh "install"
     ;;
   "install")