From 29fcff73a18d8f43dc7144c84f746496e3eaef17 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Dec 2021 23:56:16 +0100 Subject: [PATCH] 5.7 --- conf/FTL_last.src | 5 ++--- conf/admin_dashboard_last.src | 4 ++-- conf/app_last.src | 4 ++-- manifest.json | 2 +- scripts/restore | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/conf/FTL_last.src b/conf/FTL_last.src index bb6cd85..b0ef874 100644 --- a/conf/FTL_last.src +++ b/conf/FTL_last.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.11.tar.gz -SOURCE_SUM=e7f1ec8b12629ae4b1b5453f18f5247cb7c68037094c6cf7f8e046e18ce2c283 +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.12.tar.gz +SOURCE_SUM=cc0864cdf7c10b82f04049e97dafef2eacb2b8155e7cb11e0383482f5dc0f1d6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/admin_dashboard_last.src b/conf/admin_dashboard_last.src index 879e895..0104342 100644 --- a/conf/admin_dashboard_last.src +++ b/conf/admin_dashboard_last.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.8.tar.gz -SOURCE_SUM=b594374bd3d6361ad5fa35958b17a08965fcc77d3ef4c4a7938410116b0cf5be +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.9.tar.gz +SOURCE_SUM=1c89d2786bd58c18d1072227b9509f9de26f870509b353e228b193d553a9b92e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app_last.src b/conf/app_last.src index 452929e..7bb0b09 100644 --- a/conf/app_last.src +++ b/conf/app_last.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.6.tar.gz -SOURCE_SUM=c65f31418bdbfbf9ed482e5380f0b7f8370e69817dd1db70bea98f337198bf47 +SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.7.tar.gz +SOURCE_SUM=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index d36de66..78a0f38 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ad blocking via your own DNS server", "fr": "Filtrage publicitaire via votre propre serveur DNS" }, - "version": "5.6~ynh1", + "version": "5.7~ynh1", "url": "https://pi-hole.net/", "upstream": { "license": "EUPL-1.2", diff --git a/scripts/restore b/scripts/restore index a0f1e61..d17d284 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,8 +44,7 @@ fpm_service=$(ynh_app_setting_get --app=$app --key=fpm_service) #================================================= ynh_script_progression --message="Validating restoration parameters..." -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # ACTIVATE MAINTENANCE MODE