Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-07-04 14:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84 from akuker/eric/easyInstallBranch

Browse Source 
Stay on currently checked out branch for easy intall
This commit is contained in:
TomRBarber 2021-03-09 12:39:52 -05:00 committed by GitHub
commit bae70f74bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
easyinstall.sh
View File

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