From 565c75ff0c0b828b370179e0b877d629503794e5 Mon Sep 17 00:00:00 2001
From: Spacelord <Spacelord09@users.noreply.github.com>
Date: Sat, 7 Dec 2019 18:17:05 +0100
Subject: Finally git checkout bug with subshell fixed.

---
 installer.sh | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

(limited to 'installer.sh')

diff --git a/installer.sh b/installer.sh
index fc544f6..fd4dd91 100755
--- a/installer.sh
+++ b/installer.sh
@@ -7,7 +7,6 @@ user=$(whoami)                  # for bypassing user check replace "$(whoami)" w
 script_path="`cd $0; pwd`"      # Script dir
 tmp_path=$(mktemp -d)           # Repo download path
 
-Iversion="TEST!"                 # (fallback version if )
 makeargs=all                    # Build args
 
 VAR_DESTDIR=""                  # Unused
@@ -36,37 +35,24 @@ echo ""
 }
 
 INSTALL-PREP () {
-    echo "Starting Git!"
-    git clone https://github.com/cbdevnet/midimonster.git "$tmp_path" # Gets Midimonster
-    
-(
+(#### Subshell make things like cd $tmp_path easier to revert
+    echo "Starting download..."
+    git clone https://github.com/cbdevnet/midimonster.git "$tmp_path" # Gets Midimonster   
     echo ""
     echo ""
+    echo "Initializing repository..."
     cd $tmp_path
-    echo "IVer.: $Iversion"
-
-    echo "Start GIT INIT"
     git init $tmp_path
-    
-    echo "IVer.: $Iversion VOR GIT DESCRIBE!"
     echo ""
-
-
-    echo "Starting git describe.."
+    echo "Finding latest stable version..."
     Iversion=$(git describe --abbrev=0)                            # Get last tag(stable version)
-    echo "IVer.: $Iversion NACH GIT DESCRIBE!"
-    
-    echo ""
+    echo "Starting Git checkout to "$Iversion"..."
+    git checkout -f -q $Iversion
+    echo "Done."
+ )
 
-    
-    echo "Starting Git checkout to "$Iversion""
-    git checkout $Iversion
- )   
     echo ""
-    echo "Done. (Iver.: $Iversion)"
-    
-    
-    
+    echo ""
     echo ""
 
     read -e -i "$VAR_PREFIX" -p "PREFIX (Install root directory): " input # Reads VAR_PREFIX
@@ -117,7 +103,6 @@ CLEAN () {
 
 
 ################################################ Main #################################################
-
 trap ERROR SIGINT SIGTERM SIGKILL
 clear
 
-- 
cgit v1.2.3