From 21a9900e7c2ee66598cfc368b3fd554803d20f4f Mon Sep 17 00:00:00 2001
From: Roman Kupriyanov <mr.eshua@gmail.com>
Date: Wed, 21 Jul 2021 18:19:06 +0300
Subject: [PATCH] More simplification for git upgrade

---
 scripts/upgrade | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8f3eb4f..e058406 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -110,39 +110,32 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]; then
     ynh_script_progression --message="Upgrading source files..." --weight=3
-    
-    # If current install is not a Git repo then init one
+
     pushd "$final_path"
     if [ ! `git rev-parse --is-inside-work-tree &> /dev/null` ]; then
-        git init --quiet 
-	git remote add origin $repo_url
-	git fetch origin --quiet 
-	git checkout -b stable --track origin/stable --force --quiet 
+        # If current install is not a Git repo then init one
+        git init --quiet
+        git remote add origin $repo_url
+	git fetch origin --quiet
+    	git checkout -b stable --track origin/stable --force --quiet
     fi
+    git fetch --quiet
+    git checkout stable --quiet
+    git pull --quite
+    git reset --hard $version_commit --quiet 
     popd
 	
     pushd "$final_path/addon"
     if [ ! `git rev-parse --is-inside-work-tree &> /dev/null` ]; then
         git init --quiet 
-	git remote add origin $addons_repo_url
-	git fetch origin --quiet 
-	git checkout -b stable --track origin/stable --force --quiet 
+        git remote add origin $addons_repo_url
+        git fetch origin --quiet 
+        git checkout -b stable --track origin/stable --force --quiet 
     fi
-    popd
-
-    # Update through Git
-    pushd "$final_path"
     git fetch --quiet 
     git checkout stable --quiet 
     git pull --quiet 
-    git reset --hard $version_commit --quiet 
-    popd
-
-    pushd "$final_path/addon"
-    git fetch --quiet 
-    git checkout stable --quiet 
-    git pull --quiet 
-    git reset --hard $addons_version_commit --quiet 
+    git reset --quiet --hard $addons_version_commit
     popd
 fi