From 6358e8a605ce722471cb7e4b8f678ab00ca1d0d5 Mon Sep 17 00:00:00 2001 From: Sylvain CECCHETTO Date: Wed, 16 Oct 2019 13:19:40 +0200 Subject: [PATCH] [fix] change-url --- check_process | 2 +- conf/tvheadend | 2 +- manifest.json | 2 +- scripts/backup | 2 +- scripts/change_url | 4 ++-- scripts/install | 6 +++--- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index 803043c..c2f6792 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path_url="/path" (PATH) + path="/path" (PATH) superuser="toto" password="pass" ; Checks diff --git a/conf/tvheadend b/conf/tvheadend index 2ea3e3c..bbd5a39 100644 --- a/conf/tvheadend +++ b/conf/tvheadend @@ -37,7 +37,7 @@ TVH_HTTP_PORT="__PORT__" # if set to "" will use binary default # else will change the webui root context, useful for proxied # servers -TVH_HTTP_ROOT="__PATH_URL__" +TVH_HTTP_ROOT="__PATH__" # TVH_HTSP_PORT # if set to "" will use binary default diff --git a/manifest.json b/manifest.json index 40af810..22d16fc 100644 --- a/manifest.json +++ b/manifest.json @@ -32,7 +32,7 @@ "example": "example.com" }, { - "name": "path_url", + "name": "path", "type": "path", "ask": { "en": "Choose a path for Tvheadend", diff --git a/scripts/backup b/scripts/backup index 3e3b7c7..aeb1b7d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -23,7 +23,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path_url) +path_url=$(ynh_app_setting_get --app=$app --key=path) superuser=$(ynh_app_setting_get --app=$app --key=superuser) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) diff --git a/scripts/change_url b/scripts/change_url index 2a41a7f..b74fb5b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,7 +25,7 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Loading installation settings..." --weight=1 domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path_url) +path_url=$(ynh_app_setting_get --app=$app --key=path) superuser=$(ynh_app_setting_get --app=$app --key=superuser) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) @@ -95,7 +95,7 @@ ynh_backup_if_checksum_is_different --file="/etc/default/tvheadend" cp ../conf/tvheadend /etc/default/tvheadend ynh_replace_string --match_string="__CONF_DIR__" --replace_string="$final_path/.hts/tvheadend" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="/etc/default/tvheadend" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="/etc/default/tvheadend" +ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__STREAM_PORT__" --replace_string="$stream_port" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/default/tvheadend" ynh_store_file_checksum --file="/etc/default/tvheadend" diff --git a/scripts/install b/scripts/install index 18a865e..36d2920 100644 --- a/scripts/install +++ b/scripts/install @@ -18,7 +18,7 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH_URL +path_url=$YNH_APP_ARG_PATH superuser=$YNH_APP_ARG_SUPERUSER password=$YNH_APP_ARG_PASSWORD @@ -41,7 +41,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path_url --value=$path_url +ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=superuser --value=$superuser ynh_app_setting_set --app=$app --key=final_path --value=$final_path @@ -117,7 +117,7 @@ ynh_add_nginx_config cp ../conf/tvheadend /etc/default/tvheadend ynh_replace_string --match_string="__CONF_DIR__" --replace_string="$final_path/.hts/tvheadend" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="/etc/default/tvheadend" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="/etc/default/tvheadend" +ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__STREAM_PORT__" --replace_string="$stream_port" --target_file="/etc/default/tvheadend" ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/default/tvheadend" diff --git a/scripts/remove b/scripts/remove index 15da4c8..dc89a56 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,7 +16,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path_url) +path_url=$(ynh_app_setting_get --app=$app --key=path) superuser=$(ynh_app_setting_get --app=$app --key=superuser) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) diff --git a/scripts/restore b/scripts/restore index c4c4e1b..7926e38 100644 --- a/scripts/restore +++ b/scripts/restore @@ -22,7 +22,7 @@ ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path_url) +path_url=$(ynh_app_setting_get --app=$app --key=path) superuser=$(ynh_app_setting_get --app=$app --key=superuser) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) diff --git a/scripts/upgrade b/scripts/upgrade index 452996f..f65fbbc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path_url) +path_url=$(ynh_app_setting_get --app=$app --key=path) superuser=$(ynh_app_setting_get --app=$app --key=superuser) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port)