diff --git a/scripts/install b/scripts/install index c1a68eb..3279878 100644 --- a/scripts/install +++ b/scripts/install @@ -129,6 +129,9 @@ mkdir -p "$pihole_dir" cp -a "$pihole_local_repo/gravity.sh" "$pihole_dir/" cp -a $pihole_local_repo/advanced/Scripts/*.sh "$pihole_dir/" +# And copy this fucking COL_TABLE file... +cp -a "$pihole_local_repo/advanced/Scripts/COL_TABLE" "$pihole_dir/" + #================================================= # COPY THE PI-HOLE MAIN SCRIPT #================================================= @@ -299,6 +302,8 @@ systemctl start dnsmasq #================================================= cp $pihole_local_repo/advanced/pihole.cron /etc/cron.d/pihole +# Remove git usage for version. Which fails because we use here a release instead of master. +ynh_replace_string ".*updatechecker.*" "#&" /etc/cron.d/pihole #================================================= # BUILD THE LISTS WITH GRAVITY diff --git a/scripts/upgrade b/scripts/upgrade index 701df49..c049751 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -100,6 +100,9 @@ pihole_dir="/opt/pihole" cp -a "$pihole_local_repo/gravity.sh" "$pihole_dir/" cp -a $pihole_local_repo/advanced/Scripts/*.sh "$pihole_dir/" +# And copy this fucking COL_TABLE file... +cp -a "$pihole_local_repo/advanced/Scripts/COL_TABLE" "$pihole_dir/" + #================================================= # Copy the Pi-hole main script #================================================= @@ -175,6 +178,8 @@ ynh_store_file_checksum "$setupVars" # Enregistre la somme de contrĂ´le du fichi #================================================= cp $pihole_local_repo/advanced/pihole.cron /etc/cron.d/pihole +# Remove git usage for version. Which fails because we use here a release instead of master. +ynh_replace_string ".*updatechecker.*" "#&" /etc/cron.d/pihole #================================================= # START PIHOLE-FTL