From 34a445eb6fe40de0260f68a6866a80fd5ea4c64f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 6 Jul 2022 03:15:17 +0200 Subject: [PATCH] switch to .deb --- conf/app.src | 7 +++++++ scripts/install | 14 ++++++++++++-- scripts/remove | 1 + scripts/restore | 14 ++++++++++++-- scripts/upgrade | 13 +++++++++++++ 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src new file mode 100644 index 0000000..9b1982a --- /dev/null +++ b/conf/app.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/webmin/webmin/releases/download/1.984/webmin_1.984_all.deb +SOURCE_SUM=cc1e7267c945237e44762c2a8e714e271d8fafc3e8addd238ee3039ae00cb3fd +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=webmin.deb +SOURCE_EXTRACT=false diff --git a/scripts/install b/scripts/install index 94d9bb2..d1c8765 100644 --- a/scripts/install +++ b/scripts/install @@ -67,8 +67,18 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies -# Install Webmin -ynh_install_extra_app_dependencies --repo="deb https://download.webmin.com/download/repository sarge contrib" --package="webmin" --key="https://download.webmin.com/jcameron-key.asc" +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_script_progression --message="Setting up source files..." + +tempdir="$(mktemp -d)" +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$tempdir" + +dpkg --install $tempdir/webmin.deb + +ynh_exec_warn_less ynh_secure_remove --file="$tempdir" #================================================= # NGINX CONFIGURATION diff --git a/scripts/remove b/scripts/remove index 33ade03..a9d10a5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -57,6 +57,7 @@ ynh_script_progression --message="Removing dependencies..." # Remove metapackage and its dependencies ynh_exec_warn_less ynh_remove_app_dependencies +dpkg --remove $app #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 319c72f..f64bffc 100755 --- a/scripts/restore +++ b/scripts/restore @@ -42,8 +42,18 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -# Install Webmin -ynh_install_extra_app_dependencies --repo="deb https://download.webmin.com/download/repository sarge contrib" --package="webmin" --key="https://download.webmin.com/jcameron-key.asc" +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_script_progression --message="Setting up source files..." + +tempdir="$(mktemp -d)" +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$tempdir" + +dpkg --install $tempdir/webmin.deb + +ynh_exec_warn_less ynh_secure_remove --file="$tempdir" #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 239fb56..10fc255 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,6 +62,19 @@ if ! ynh_permission_exists --permission="admin"; then ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin fi +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_script_progression --message="Setting up source files..." + +tempdir="$(mktemp -d)" +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$tempdir" + +dpkg --install $tempdir/webmin.deb + +ynh_exec_warn_less ynh_secure_remove --file="$tempdir" + #================================================= # UPGRADE DEPENDENCIES #=================================================