fix getters / setters args

scripts/_common.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 service_name="ynh-vpnclient"
-service_checker_name=$service_name"-checker"
+service_checker_name="$service_name-checker"
 
 # Operations needed by both 'install' and 'upgrade' scripts
 function vpnclient_deploy_files_and_services()
@@ -46,9 +46,9 @@ function vpnclient_deploy_files_and_services()
   #=================================================
   ynh_print_info "Configuring $app's systemd service..."
 
-  ynh_config_add_systemd $service_name "$service_name.service"
+  ynh_config_add_systemd --service="$service_name" --template="$service_name.service"
 
-  ynh_config_add_systemd $service_checker_name "$service_checker_name.service"
+  ynh_config_add_systemd --service="$service_checker_name" --template="$service_checker_name.service"
 }
 
 function read_cube() {

scripts/config

@@ -31,7 +31,7 @@ BACKTICK='`'
 TRIPLEBACKTICKS='```'
 
 get__status() {
-    local service_enabled=$(ynh_app_setting_get $app service_enabled)
+    local service_enabled=$(ynh_app_setting_get --key="service_enabled")
 
     ipv4=$(ping -w3 -c1 ip.yunohost.org  >/dev/null 2>&1 && curl --max-time 5 https://ip.yunohost.org --silent)
     ipv6=$(ping -w3 -c1 ip6.yunohost.org >/dev/null 2>&1 && curl --max-time 5 https://ip6.yunohost.org --silent)
@@ -243,9 +243,9 @@ ynh_app_config_apply() {
 
     # or takes the value of the previous upload, that is, the target path for the cube file.
     if [[ -n "${cube_file:-}" && "$cube_file" != "/etc/openvpn/client.cube" ]]; then
-      ynh_app_setting_set $app ip6_addr "$ip6_addr"
-      ynh_app_setting_set $app ip6_net "$ip6_net"
-      ynh_app_setting_set $app ip6_send_over_tun_enabled "$ip6_send_over_tun_enabled"
+      ynh_app_setting_set --key="ip6_addr" --value="$ip6_addr"
+      ynh_app_setting_set --key="ip6_net" --value="$ip6_net"
+      ynh_app_setting_set --key="ip6_send_over_tun_enabled" --value"$ip6_send_over_tun_enabled"
     fi
 
     if [[ ${ip6_send_over_tun_enabled} -eq 1 ]]; then

scripts/install

@@ -4,12 +4,12 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 # Default values for config panel
-ynh_app_setting_set "$app" service_enabled 0
-ynh_app_setting_set "$app" dns_method "yunohost"
-ynh_app_setting_set "$app" nameservers ""
-ynh_app_setting_set "$app" ip6_addr ""
-ynh_app_setting_set "$app" ip6_net ""
-ynh_app_setting_set "$app" ip6_send_over_tun_enabled 0
+ynh_app_setting_set --key="service_enabled" --value="0"
+ynh_app_setting_set --key="dns_method" --value="yunohost"
+ynh_app_setting_set --key="nameservers" --value=""
+ynh_app_setting_set --key="ip6_addr" --value=""
+ynh_app_setting_set --key="ip6_net" --value=""
+ynh_app_setting_set --key="ip6_send_over_tun_enabled" --value="0"
 
 #=================================================
 # DEPLOY FILES FROM PACKAGE

scripts/upgrade

@@ -16,21 +16,21 @@ fi
 
 if [ -f /etc/nginx/conf.d/*.d/$app.conf ]; then
 	ynh_safe_rm /etc/nginx/conf.d/*.d/$app.conf
-    ynh_systemctl --service=nginx --action=reload
+  ynh_systemctl --service="nginx" --action="reload"
 fi
 
 for php_path in $(ls /etc/php/*/fpm/pool.d/$app.conf 2> /dev/null); do
-	ynh_safe_rm $php_path
+	ynh_safe_rm "$php_path"
 done
 
 if [ -d /var/www/$app ]; then
-	ynh_safe_rm /var/www/$app
+	ynh_safe_rm "/var/www/$app"
 fi
 
-[ -z "${domain:-}" ] || ynh_app_setting_delete $app domain
-[ -z "${path:-}" ] || ynh_app_setting_delete $app path
-[ -z "${is_public:-}" ] || ynh_app_setting_delete $app is_public
-[ -z "${install_dir:-}" ] || ynh_app_setting_delete $app install_dir
+[ -z "${domain:-}" ] || ynh_app_setting_delete domain
+[ -z "${path:-}" ] || ynh_app_setting_delete path
+[ -z "${is_public:-}" ] || ynh_app_setting_delete is_public
+[ -z "${install_dir:-}" ] || ynh_app_setting_delete install_dir
 
 if [ -e "/etc/sudoers.d/${app}_ynh" ]; then
   ynh_safe_rm "/etc/sudoers.d/${app}_ynh"
@@ -47,24 +47,24 @@ fi
 # New stuff
 
 if [ -z "${dns_method:-}" ]; then
-    ynh_app_setting_set --key=dns_method --value=custom
+    ynh_app_setting_set --key="dns_method" --value="custom"
 fi
 # FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=nameservers --value="$(grep -o -P '\s*nameserver\s+\K[abcdefabcdef\d.:]+' /etc/resolv.dnsmasq.conf | sort | uniq | paste -s -d, -)"
 if [ -z "${nameservers:-}" ]; then
     nameservers="$(grep -o -P '\s*nameserver\s+\K[abcdefabcdef\d.:]+' /etc/resolv.dnsmasq.conf | sort | uniq | paste -s -d, -)"
-    ynh_app_setting_set --key=nameservers --value="$nameservers"
+    ynh_app_setting_set --key="nameservers" --value="$nameservers"
 fi
 if [ -z "${service_enabled:-}" ]; then
-    ynh_app_setting_set --key=service_enabled --value=0
+    ynh_app_setting_set --key="service_enabled" --value="0"
 fi
 if [ -z "${ip6_addr:-}" ]; then
-    ynh_app_setting_set --key=ip6_addr --value=""
+    ynh_app_setting_set --key="ip6_addr" --value=""
 fi
 if [ -z "${ip6_net:-}" ]; then
-    ynh_app_setting_set --key=ip6_net --value=""
+    ynh_app_setting_set --key="ip6_net" --value=""
 fi
 if [ -z "${ip6_send_over_tun_enabled:-}" ]; then
-    ynh_app_setting_set --key=ip6_send_over_tun_enabled --value=0
+    ynh_app_setting_set --key="ip6_send_over_tun_enabled" --value="0"
 fi
 
 #=================================================
@@ -117,7 +117,7 @@ for config_file in ${tmp_dir}/client.{conf,cube,ovpn}; do
     cp "${config_file}" /etc/openvpn/
   fi
 done
-ynh_safe_rm ${tmp_dir}
+ynh_safe_rm "${tmp_dir}"
 
 #=================================================
 # SERVICE INTEGRATION IN YUNOHOST