From 7f979ad9a27ff3e9c6f4a6044e22a70a8ff322b7 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 31 Oct 2024 09:54:26 -0400
Subject: [PATCH] Update update pi-power-button use master branch

---
 update | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/update b/update
index b2dccbe2..fcef1749 100755
--- a/update
+++ b/update
@@ -215,21 +215,8 @@ fi
 
 cd /home/pi/pi-power-button
 
-git checkout reboot-mode-change-beta > .updated_b
+git checkout master
 
-  grep 'error' /home/pi/pi-power-button/.updated_b
-  if [[ $(grep 'error' /home/pi/pi-power-button/.updated_b) ]]; then
-  
-    echo "pi-power-button switching to beta branch"
-
-    git pull
-
-    git checkout reboot-mode-change-beta
-    
-    script/install
-
-    FLAG=1
-  fi
 
   git pull --no-rebase > .updated_p
 
@@ -241,20 +228,7 @@ git checkout reboot-mode-change-beta > .updated_b
     script/install
 
     FLAG=1
-    
-#    echo "You need to reboot to complete this update.  Reboot now (y/n)?"
-
-#    read -r ANS
-
- #   if [ "$ANS" = "y" ]; then
-
- #     sudo reboot now
-
- #   else
-
-  #    echo "The CubeSatSim software may not work correctly until you reboot."
 
- # fi  
 
   else
     echo "nothing to do for pi-power-button."