From cbd7f17508250570dd62f742091ed02082a42ce4 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <eric@sproutary.com>
Date: Sun, 7 Mar 2021 09:52:04 -0600
Subject: [PATCH] Stay on currently checked out branch for easy intall

---
 easyinstall.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/easyinstall.sh b/easyinstall.sh
index 811adda9..66728bdc 100755
--- a/easyinstall.sh
+++ b/easyinstall.sh
@@ -24,7 +24,7 @@ VIRTUAL_DRIVER_PATH=/home/pi/images
 HFS_FORMAT=/usr/bin/hformat
 HFDISK_BIN=/usr/bin/hfdisk
 LIDO_DRIVER=~/RASCSI/lido-driver.img
-
+GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
 function initialChecks() {
     currentUser=$(whoami)
@@ -103,10 +103,11 @@ function installRaScsiWebInterface() {
 }
 
 function updateRaScsiGit() {
+    echo "Updating checked out branch $GIT_BRANCH"
     cd ~/RASCSI
-    git fetch
+    git fetch origin
     git stash
-    git rebase origin/master
+    git rebase origin/$GIT_BRANCH
     git stash apply
 }