From 577d1d691957ded31ef1b0f73b4ad3c06a294c1f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Mar 2022 08:51:31 +0100 Subject: [PATCH] Upgrade --- conf/admin_dashboard.src | 4 ++-- scripts/_common.sh | 13 +++++++++++++ scripts/actions/reset_default_app | 2 -- scripts/install | 4 +--- scripts/restore | 4 +--- scripts/upgrade | 4 +--- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/conf/admin_dashboard.src b/conf/admin_dashboard.src index 0104342..0f9db8e 100644 --- a/conf/admin_dashboard.src +++ b/conf/admin_dashboard.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.9.tar.gz -SOURCE_SUM=1c89d2786bd58c18d1072227b9509f9de26f870509b353e228b193d553a9b92e +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.11.tar.gz +SOURCE_SUM=589ef049135a90d622fc68299140e4dc16451ce541b804b35ffa5d25201afeb4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/_common.sh b/scripts/_common.sh index 8d3534c..da847a5 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,18 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + +YNH_PHP_VERSION="7.3" + +# Dependencies +pkg_dependencies="sqlite3 idn2 php${YNH_PHP_VERSION}-sqlite3 nettle-dev libcap2-bin build-essential libgmp-dev m4 cmake libidn11-dev libreadline-dev xxd" + +pihole_core_version=5.รง +dashboard_version=5.11 +FTL_version=5.14 + #================================================= # FUTUR OFFICIAL HELPERS #================================================= diff --git a/scripts/actions/reset_default_app b/scripts/actions/reset_default_app index 61a94d7..6fab71d 100755 --- a/scripts/actions/reset_default_app +++ b/scripts/actions/reset_default_app @@ -7,8 +7,6 @@ #================================================= # Load common variables for all scripts. -source scripts/_variables - source scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/install b/scripts/install index e5a844b..fb870f3 100644 --- a/scripts/install +++ b/scripts/install @@ -7,8 +7,6 @@ #================================================= # Load common variables for all scripts. -source _variables - source _common.sh source /usr/share/yunohost/helpers @@ -83,7 +81,7 @@ ynh_exec_fully_quiet yunohost firewall allow Both 53 --no-upnp #================================================= ynh_script_progression --message="Installing dependencies..." --weight=12 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index a859a31..4033e09 100644 --- a/scripts/restore +++ b/scripts/restore @@ -7,8 +7,6 @@ #================================================= # Load common variables for all scripts. -source ../settings/scripts/_variables - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -109,7 +107,7 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --dedicated_ser #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=12 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/upgrade b/scripts/upgrade index 40e6f71..4d7ad60 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,8 +7,6 @@ #================================================= # Load common variables for all scripts. -source _variables - source _common.sh source /usr/share/yunohost/helpers @@ -123,7 +121,7 @@ ynh_maintenance_mode_ON #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=6 -ynh_install_app_dependencies $app_depencencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER