Browse Source

Merge pull request #34 from keomabrun/master

removing -v from ynh_app_setting_set
Keoma Brun 6 years ago
parent
commit
b1d97c02be
2 changed files with 18 additions and 18 deletions
  1. 17 17
      scripts/install
  2. 1 1
      scripts/upgrade

+ 17 - 17
scripts/install

@@ -165,31 +165,31 @@ wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }')
 # Save arguments
 
 if [[ -z $wifi_device ]]; then
-  ynh_app_setting_set $app service_enabled -v 0
+  ynh_app_setting_set $app service_enabled 0
   wifi_device=none
 else
-  ynh_app_setting_set $app service_enabled -v 1
+  ynh_app_setting_set $app service_enabled 1
 fi
 
 #=================================================
 # SAVE SETTINGS
 #=================================================
 
-ynh_app_setting_set $app multissid -v 1
-ynh_app_setting_set $app wifi_ssid -v "${wifi_ssid}"
-ynh_app_setting_set $app wifi_secure -v 1
-ynh_app_setting_set $app wifi_passphrase -v "${wifi_passphrase}"
-ynh_app_setting_set $app wifi_device -v "${wifi_device}"
-ynh_app_setting_set $app wifi_channel -v 6
-ynh_app_setting_set $app ip6_addr -v "${ip6_addr}"
-ynh_app_setting_set $app ip6_firewall -v 1
-ynh_app_setting_set $app ip6_net -v "${ip6_net}"
-ynh_app_setting_set $app ip6_dns0 -v 2001:913::8
-ynh_app_setting_set $app ip6_dns1 -v 2001:910:800::12
-ynh_app_setting_set $app ip4_dns0 -v 80.67.188.188
-ynh_app_setting_set $app ip4_dns1 -v 80.67.169.12
-ynh_app_setting_set $app ip4_nat_prefix -v 10.0.242
-ynh_app_setting_set $app vpnclient -v no
+ynh_app_setting_set $app multissid 1
+ynh_app_setting_set $app wifi_ssid "${wifi_ssid}"
+ynh_app_setting_set $app wifi_secure 1
+ynh_app_setting_set $app wifi_passphrase "${wifi_passphrase}"
+ynh_app_setting_set $app wifi_device "${wifi_device}"
+ynh_app_setting_set $app wifi_channel 6
+ynh_app_setting_set $app ip6_addr "${ip6_addr}"
+ynh_app_setting_set $app ip6_firewall 1
+ynh_app_setting_set $app ip6_net "${ip6_net}"
+ynh_app_setting_set $app ip6_dns0 2001:913::8
+ynh_app_setting_set $app ip6_dns1 2001:910:800::12
+ynh_app_setting_set $app ip4_dns0 80.67.188.188
+ynh_app_setting_set $app ip4_dns1 80.67.169.12
+ynh_app_setting_set $app ip4_nat_prefix 10.0.242
+ynh_app_setting_set $app vpnclient no
 
 
 #=================================================

+ 1 - 1
scripts/upgrade

@@ -49,7 +49,7 @@ if [[ -z $(ynh_app_setting_get $app ip6_firewall) ]]; then
   ip6_firewall=$(printf '1|%.0s' $(seq "${multissid}"))
   ip6_firewall=$(echo "${ip6_firewall%?}")
 
-  ynh_app_setting_set "${app}" ip6_firewall -v "${ip6_firewall}"
+  ynh_app_setting_set "${app}" ip6_firewall "${ip6_firewall}"
 fi
 
 ynh_systemctl start ynh-hotspot