diff --git a/check_process b/check_process index 84078dd..189ba42 100644 --- a/check_process +++ b/check_process @@ -7,7 +7,6 @@ path="/path" (PATH) admin="john" (USER) is_public=1 (PUBLIC|public=1|private=0) - update=0 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 0278f7c..71f638b 100644 --- a/manifest.json +++ b/manifest.json @@ -57,15 +57,7 @@ "fr": "Est-ce une application publique ?" }, "default": true - }, - { - "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 aa9c23c..697fcf5 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,7 @@ admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC random_key=$(ynh_string_random --length=32) email=$(ynh_user_get_info --username=$admin --key=mail) -update=$YNH_APP_ARG_UPDATE +update=1 app=$YNH_APP_INSTANCE_NAME #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8f1a1b9..8495f66 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,7 +26,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) random_key=$(ynh_app_setting_get --app=$app --key=random_key) email=$(ynh_user_get_info --username=$admin --key=mail) -update=$(ynh_app_setting_get --app=$app --key=update) +update=$(ynh_app_setting_get --app=$app --key=update) #================================================= # CHECK VERSION @@ -95,10 +95,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 ynh_secure_remove bootstrap/cache/*