From 686afe32acaa224e9383547cffa7cba0f7da71ad Mon Sep 17 00:00:00 2001 From: kay0u Date: Sun, 18 Aug 2019 20:27:59 +0200 Subject: [PATCH] use 1 or 0 not true or false --- scripts/_common.sh | 18 ------------------ scripts/config | 41 ++++++++++------------------------------- 2 files changed, 10 insertions(+), 49 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1caa856..3bf74f9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,24 +6,6 @@ pkg_dependencies="openssh-server" -#================================================= -# BOOLEAN CONVERTER -#================================================= - -bool_to_01 () { - local var="$1" - [ "$var" = "true" ] && var=1 - [ "$var" = "false" ] && var=0 - echo "$var" -} - -bool_to_true_false () { - local var="$1" - [ "$var" = "1" ] && var=true - [ "$var" = "0" ] && var=false - echo "$var" -} - #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/config b/scripts/config index 508a153..efaa386 100644 --- a/scripts/config +++ b/scripts/config @@ -27,50 +27,39 @@ app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} # is_public old_is_public="$(ynh_app_setting_get --app=$app --key=is_public)" -old_is_public=$(bool_to_true_false $old_is_public) is_public="${YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC:-$old_is_public}" # Overwrite nginx configuration old_overwrite_nginx="$(ynh_app_setting_get --app=$app --key=overwrite_nginx)" -old_overwrite_nginx=$(bool_to_true_false $old_overwrite_nginx) overwrite_nginx="${YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX:-$old_overwrite_nginx}" # use_web_account old_use_web_account="$(ynh_app_setting_get --app=$app --key=use_web_account)" -old_use_web_account=$(bool_to_true_false $old_use_web_account) use_web_account="${YNH_CONFIG_MAIN_USERS_USE_WEB_ACCOUNT:-$old_use_web_account}" # backup_strategy old_backup_db="$(ynh_app_setting_get --app=$app --key=backup_db)" -old_backup_db=$(bool_to_true_false $old_backup_db) backup_db="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_DB:-$old_backup_db}" old_backup_uploads="$(ynh_app_setting_get --app=$app --key=backup_uploads)" -old_backup_uploads=$(bool_to_true_false $old_backup_uploads) backup_uploads="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_UPLOADS:-$old_backup_uploads}" old_backup_repositories="$(ynh_app_setting_get --app=$app --key=backup_repositories)" -old_backup_repositories=$(bool_to_true_false $old_backup_repositories) backup_repositories="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REPOSITORIES:-$old_backup_repositories}" old_backup_builds="$(ynh_app_setting_get --app=$app --key=backup_builds)" -old_backup_builds=$(bool_to_true_false $old_backup_builds) backup_builds="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_BUILDS:-$old_backup_builds}" old_backup_artifacts="$(ynh_app_setting_get --app=$app --key=backup_artifacts)" -old_backup_artifacts=$(bool_to_true_false $old_backup_artifacts) backup_artifacts="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_ARTIFACTS:-$old_backup_artifacts}" old_backup_lfs="$(ynh_app_setting_get --app=$app --key=backup_lfs)" -old_backup_lfs=$(bool_to_true_false $old_backup_lfs) backup_lfs="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_LFS:-$old_backup_lfs}" old_backup_registry="$(ynh_app_setting_get --app=$app --key=backup_registry)" -old_backup_registry=$(bool_to_true_false $old_backup_registry) backup_registry="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REGISTRY:-$old_backup_registry}" old_backup_pages="$(ynh_app_setting_get --app=$app --key=backup_pages)" -old_backup_pages=$(bool_to_true_false $old_backup_pages) backup_pages="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_PAGES:-$old_backup_pages}" #================================================= @@ -110,40 +99,30 @@ show_config() { apply_config() { # Change public accessibility - if [ "$is_public" = "true" ] - then - yunohost app action run $app public_private --args is_public=1 - else - yunohost app action run $app public_private --args is_public=0 - fi + yunohost app action run $app public_private --args is_public=$is_public # Change use_web_account - if [ "$use_web_account" = "true" ] - then - yunohost app action run $app web_account --args use_web_account=1 - else - yunohost app action run $app web_account --args use_web_account=0 - fi + yunohost app action run $app web_account --args use_web_account=$use_web_account # Set overwrite_nginx ynh_app_setting_set --app=$app --key=overwrite_nginx --value="$overwrite_nginx" # Set backup_db - ynh_app_setting_set --app=$app --key=backup_db --value="$(bool_to_01 $backup_db)" + ynh_app_setting_set --app=$app --key=backup_db --value="$backup_db" # Set backup_uploads - ynh_app_setting_set --app=$app --key=backup_uploads --value="$(bool_to_01 $backup_uploads)" + ynh_app_setting_set --app=$app --key=backup_uploads --value="$backup_uploads" # Set backup_repositories - ynh_app_setting_set --app=$app --key=backup_repositories --value="$(bool_to_01 $backup_repositories)" + ynh_app_setting_set --app=$app --key=backup_repositories --value="$backup_repositories" # Set backup_builds - ynh_app_setting_set --app=$app --key=backup_builds --value="$(bool_to_01 $backup_builds)" + ynh_app_setting_set --app=$app --key=backup_builds --value="$backup_builds" # Set backup_artifacts - ynh_app_setting_set --app=$app --key=backup_artifacts --value="$(bool_to_01 $backup_artifacts)" + ynh_app_setting_set --app=$app --key=backup_artifacts --value="$backup_artifacts" # Set backup_lfs - ynh_app_setting_set --app=$app --key=backup_lfs --value="$(bool_to_01 $backup_lfs)" + ynh_app_setting_set --app=$app --key=backup_lfs --value="$backup_lfs" # Set backup_registry - ynh_app_setting_set --app=$app --key=backup_registry --value="$(bool_to_01 $backup_registry)" + ynh_app_setting_set --app=$app --key=backup_registry --value="$backup_registry" # Set backup_pages - ynh_app_setting_set --app=$app --key=backup_pages --value="$(bool_to_01 $backup_pages)" + ynh_app_setting_set --app=$app --key=backup_pages --value="$backup_pages" } #=================================================