diff --git a/scripts/actions/reset_default_app b/scripts/actions/reset_default_app index 3f44058..ea606ed 100755 --- a/scripts/actions/reset_default_app +++ b/scripts/actions/reset_default_app @@ -71,7 +71,7 @@ else YNH_CWD=$PWD ynh_setup_source --dest_dir="$final_path" --source_id=admin_dashboard_last fi -chown -R $app:www-data "$final_path" +chown $app:www-data "$final_path" ) diff --git a/scripts/install b/scripts/install index 0e2725b..a545390 100644 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ else ynh_setup_source --dest_dir="$final_path" --source_id=admin_dashboard_last fi -chown -R $app:www-data "$final_path" +chown $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION @@ -220,7 +220,10 @@ fi # Instead of downloading a binary file, we're going to compile it ( cd "$FTL_temp_path" -ynh_exec_warn_less cmake . +if [ "$pihole_version" == "Last available" ] +then + ynh_exec_warn_less cmake . +fi ynh_exec_warn_less make ynh_exec_warn_less make install ) ynh_secure_remove --file="$FTL_temp_path" diff --git a/scripts/restore b/scripts/restore index 6afc7c4..d76a18c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -176,6 +176,7 @@ then # https://github.com/pi-hole/FTL/tree/master/dnsmasq ln -s /usr/bin/pihole-FTL /usr/sbin/dnsmasq + pihole_local_repo="/etc/.pihole" cp -a $pihole_local_repo/advanced/Templates/pihole-FTL.service /etc/init.d/pihole-FTL chmod +x /etc/init.d/pihole-FTL ynh_exec_warn_less systemctl enable pihole-FTL diff --git a/scripts/upgrade b/scripts/upgrade index 83ca487..e0426df 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -163,7 +163,7 @@ then fi fi -chown -R $app:www-data "$final_path" +chown $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION @@ -260,7 +260,10 @@ then # Instead of downloading a binary file, we're going to compile it ( cd "$FTL_temp_path" - ynh_exec_warn_less cmake . + if [ "$pihole_version" == "Last available" ] + then + ynh_exec_warn_less cmake . + fi ynh_exec_warn_less make ynh_exec_warn_less make install ) ynh_secure_remove --file="$FTL_temp_path"