From 2d8707440d556779acb26a562db6afa0411199b0 Mon Sep 17 00:00:00 2001
From: Amo <parrot@localhost.localdomain>
Date: Wed, 2 Jun 2021 01:44:07 +0530
Subject: [PATCH] No option for force upgrade to user

---
 check_process   |  1 -
 manifest.json   | 12 +-----------
 scripts/install |  2 +-
 scripts/upgrade |  4 ++--
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/check_process b/check_process
index 478cacc..a1fa64f 100644
--- a/check_process
+++ b/check_process
@@ -9,7 +9,6 @@
 		admin="john"	(USER)
 		registration=1
 		is_public=1	(PUBLIC|public=1|private=0)
-	    update=0
     ; Checks
 		pkg_linter=1
 		setup_sub_dir=0
diff --git a/manifest.json b/manifest.json
index 69642c0..0e90bae 100644
--- a/manifest.json
+++ b/manifest.json
@@ -68,16 +68,6 @@
                     "cs": "Mohou se noví uživatelé registrovat?"
                 },
                 "default": false
-            },
-            {
-                
-           "name": "update",
-           "type": "boolean",
-           "ask":{
-                "en": "Making this option to true will give you an option to force upgrade to new version without the package being updated to that version. WARNING: This can be risky and break your app if specific version have additional steps than noraml upgrade. Keep the option false, if you are not sure."
-           },
-           "default": false
-            }
-        ]
+            }       ]
     }
 }
diff --git a/scripts/install b/scripts/install
index 06d8e7b..be264f7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -31,7 +31,7 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 registration=$YNH_APP_ARG_REGISTRATION
 random_key=$(ynh_string_random 32)
 app=$YNH_APP_INSTANCE_NAME
-update=$YNH_APP_ARG_UPDATE
+update=0
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
diff --git a/scripts/upgrade b/scripts/upgrade
index 0653907..d2ce465 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -79,10 +79,10 @@ then
 	  pushd "$final_path"
         if [ $update -eq 1 ]
         then
-          git fetch --tags
+          git fetch origin tag $latest_tag --no-tags
           git checkout $latest_tag  
         else
-          git fetch --tags
+          git fetch origin tag $tag --no-tags
           git checkout $tag
         fi
       popd