Преглед изворни кода

Fix SET UP CONF_REGEN HOOK

yalh76 пре 3 година
родитељ
комит
45f4d7cda8
3 измењених фајлова са 6 додато и 3 уклоњено
  1. 2 1
      scripts/actions/reset_default_app
  2. 2 1
      scripts/install
  3. 2 1
      scripts/upgrade

+ 2 - 1
scripts/actions/reset_default_app

@@ -191,7 +191,8 @@ ynh_replace_string --match_string=".*updatechecker.*" --replace_string="#&" --ta
 
 (
 	cd scripts
-	ynh_add_config --template="../conf/dnsmasq_regenconf_hook" --destination="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
+	cp ../conf/dnsmasq_regenconf_hook /usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app
+	ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
 )
 
 #=================================================

+ 2 - 1
scripts/install

@@ -308,7 +308,8 @@ echo "$(ynh_app_upstream_version) $pihole_adminlte_version $pihole_flt_version"
 #=================================================
 ynh_script_progression --message="Setting up conf_regen hook..." --weight=1
 
-ynh_add_config --template="../conf/dnsmasq_regenconf_hook" --destination="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
+cp ../conf/dnsmasq_regenconf_hook /usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app
+ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
 
 systemctl daemon-reload
 ynh_exec_warn_less yunohost tools regen-conf dnsmasq

+ 2 - 1
scripts/upgrade

@@ -375,7 +375,8 @@ echo "$(ynh_app_upstream_version) $pihole_adminlte_version $pihole_flt_version"
 #=================================================
 ynh_script_progression --message="Updating conf_regen hook..." --weight=1
 
-ynh_add_config --template="../conf/dnsmasq_regenconf_hook" --destination="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
+cp ../conf/dnsmasq_regenconf_hook /usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app
+ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/usr/share/yunohost/hooks/conf_regen/50-dnsmasq_$app"
 
 systemctl daemon-reload
 ynh_exec_warn_less yunohost tools regen-conf dnsmasq