diff --git a/scripts/backup b/scripts/backup index b16ecdd..fcbb6d0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,7 +32,7 @@ data_path=$(ynh_app_setting_get --app="$app" --key=data_path) log_file=$(ynh_app_setting_get --app="$app" --key=log_file) path_url=$(ynh_app_setting_get --app="$app" --key=path_url) python=$(ynh_app_setting_get --app="$app" --key=python) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_name=$(ynh_app_setting_get --app="$app" --key=db_name) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/change_url b/scripts/change_url index 329252a..fd09911 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,7 +23,7 @@ new_domain=$YNH_APP_NEW_DOMAIN #================================================= ynh_script_progression --message="Loading installation settings..." -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP @@ -54,7 +54,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action=stop --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -80,7 +80,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action=start --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index ceab77c..bd0d117 100644 --- a/scripts/install +++ b/scripts/install @@ -83,10 +83,10 @@ mynh_system_user_create #================================================= ynh_script_progression --message="Creating a MySQL database..." -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +db_name=$(ynh_sanitize_dbid --db_name="$app") +db_user="$db_name" +ynh_app_setting_set --app="$app" --key=db_name --value="$db_name" +ynh_mysql_setup_db --db_user="$db_user" --db_name="$db_name" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -95,11 +95,11 @@ ynh_script_progression --message="Setting up source files..." # create a directory for the installation of Home Assistant myynh_create_dir "$final_path" -chown -R $app: "$final_path" +chown -R "$app": "$final_path" # create a directory for the datas of Home Assistant myynh_create_dir "$data_path/.cache" -chown -R $app: "$data_path" +chown -R "$app": "$data_path" # installation in a virtual environment ynh_script_progression --message="Installing Home Assistant in a virtual environment..." @@ -165,13 +165,13 @@ yunohost service add "$app" --description="Home Assistant server" --log="$log_fi ynh_script_progression --message="Starting a systemd service..." # start systemd service with --verbose -ynh_systemd_action --service_name="$app" --action="start" --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 +ynh_systemd_action --service_name="$app" --action=start --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 # remove --verbose from systemd service ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app.service" ynh_store_file_checksum --file="/etc/systemd/system/$app.service" systemctl daemon-reload -ynh_systemd_action --service_name="$app" --action="restart" +ynh_systemd_action --service_name="$app" --action=restart #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index b2a2a39..1d765b0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,15 +18,15 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) +domain=$(ynh_app_setting_get --app="$app" --key=domain) +port=$(ynh_app_setting_get --app="$app" --key=port) final_path=$(ynh_app_setting_get --app="$app" --key=final_path) data_path=$(ynh_app_setting_get --app="$app" --key=data_path) log_file=$(ynh_app_setting_get --app="$app" --key=log_file) path_url=$(ynh_app_setting_get --app="$app" --key=path_url) python=$(ynh_app_setting_get --app="$app" --key=python) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +db_name=$(ynh_app_setting_get --app="$app" --key=db_name) +db_user="$db_name" #================================================= # STANDARD REMOVE @@ -58,7 +58,7 @@ ynh_remove_logrotate #================================================= ynh_script_progression --message="Removing the MySQL database..." -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +ynh_mysql_remove_db --db_user="$db_user" --db_name="$db_name" #================================================= # REMOVE APP MAIN DIR @@ -121,7 +121,7 @@ ynh_secure_remove --file="$(dirname "$log_file")" #================================================= ynh_script_progression --message="Removing the dedicated system user..." -ynh_system_user_delete --username=$app +ynh_system_user_delete --username="$app" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index d657d38..9dd04c3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,8 @@ data_path=$(ynh_app_setting_get --app="$app" --key=data_path) log_file=$(ynh_app_setting_get --app="$app" --key=log_file) path_url=$(ynh_app_setting_get --app="$app" --key=path_url) python=$(ynh_app_setting_get --app="$app" --key=python) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +db_name=$(ynh_app_setting_get --app="$app" --key=db_name) +db_user="$db_name" #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -93,9 +93,9 @@ myynh_install_dependencies --python="$python" #================================================= ynh_script_progression --message="Restoring the MySQL database..." -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +db_pwd=$(ynh_app_setting_get --app="$app" --key=mysqlpwd) +ynh_mysql_setup_db --db_user="$db_user" --db_name="$db_name" --db_pwd="$db_pwd" +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= # RESTORE VARIOUS FILES @@ -112,7 +112,7 @@ ynh_restore_file --origin_path="$(dirname "$log_file")" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service --quiet +systemctl enable "$app".service --quiet #================================================= # RESTORE THE LOGROTATE CONFIGURATION @@ -139,15 +139,7 @@ yunohost service add "$app" --description="Home Assistant server" --log="$log_fi #================================================= ynh_script_progression --message="Starting a systemd service..." -# start systemd service with --verbose -sed --in-place "/ExecStart/s/$/ --verbose/" "/etc/systemd/system/$app.service" -ynh_systemd_action --service_name="$app" --action=start --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 - -# remove --verbose from service and restart -ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app.service" -ynh_store_file_checksum --file="/etc/systemd/system/$app.service" -systemctl daemon-reload -ynh_systemd_action --service_name="$app" --action=restart +ynh_systemd_action --service_name="$app" --action=start #================================================= # GENERIC FINALIZATION @@ -156,7 +148,6 @@ ynh_systemd_action --service_name="$app" --action=restart #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index aa37b22..f2d2fb0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,7 +43,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action=stop --log_path="/var/log/$app/$app.log" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -79,7 +79,7 @@ fi if [ ! -d "$final_path" ]; then # move $final_path to new directory mv "/opt/yunohost/$app" "$final_path" - chown -R $app: "$final_path" + chown -R "$app": "$final_path" fi if [ ! -d "$data_path" ]; then # move $data_path to new directory @@ -87,7 +87,7 @@ if [ ! -d "$data_path" ]; then find "$data_path/.$app" -maxdepth 1 -mindepth 1 -exec mv {} "$data_path" \; rmdir "$data_path/.$app" ynh_replace_string --match_string="/home/homeassistant/.homeassistant" --replace_string="$data_path" --target_file="$data_path/configuration.yaml" - chown -R $app: "$data_path" + chown -R "$app": "$data_path" fi if [ ! -f "$log_file" ]; then # create a directory with its log file @@ -98,10 +98,10 @@ fi # changes introduced in 2021.12.8~ynh1 if [ -z $(ynh_app_setting_get --app="$app" --key=db_name) ]; then # create a MySQL database - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$db_name - ynh_app_setting_set --app=$app --key=db_name --value=$db_name - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name + db_name=$(ynh_sanitize_dbid --db_name="$app") + db_user="$db_name" + ynh_app_setting_set --app=$app --key=db_name --value="$db_name" + ynh_mysql_setup_db --db_user="$db_user" --db_name="$db_name" db_pwd=$(ynh_app_setting_get --app="$app" --key=mysqlpwd) if [ -z $(sed -n "/recorder:/=" configuration.yaml) ]; then sed -i "$ a recorder:" "$data_path/configuration.yaml" @@ -188,13 +188,13 @@ yunohost service add "$app" --description="Home Assistant server" --log="$log_fi ynh_script_progression --message="Starting a systemd service..." # start systemd service with --verbose -ynh_systemd_action --service_name="$app" --action="start" --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 +ynh_systemd_action --service_name="$app" --action=start --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 # remove --verbose from service ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app.service" ynh_store_file_checksum --file="/etc/systemd/system/$app.service" systemctl daemon-reload -ynh_systemd_action --service_name="$app" --action="restart" +ynh_systemd_action --service_name="$app" --action=restart #================================================= # RELOAD NGINX