From 006d86d0cfe122b281a926343df06b1d65a80d5e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Feb 2022 23:23:32 +0100 Subject: [PATCH] Fix --- conf/app.src | 9 +++++---- scripts/install | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/conf/app.src b/conf/app.src index f53f889..da13b92 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,7 @@ -SOURCE_URL=https://github.com/kiwiirc/kiwiirc/releases/download/v1.5.0/kiwiirc_v1.5.0.zip -SOURCE_SUM=c7b31b2a92b173db4a3878d95aa74c8eb796e7b4d5600a80a00a73d80aa12ada +SOURCE_URL=https://kiwiirc.com/downloads/kiwiirc_20.05.24.1-1_amd64.deb +SOURCE_SUM=c99504c6de678fd91aed357ff0dada16a8df9e932970ed85767b516a9f87df52 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= +SOURCE_FILENAME=kiwiirc_20.05.24.1-1_amd64.deb +SOURCE_EXTRACT=false \ No newline at end of file diff --git a/scripts/install b/scripts/install index b454e28..00bdde1 100644 --- a/scripts/install +++ b/scripts/install @@ -69,27 +69,33 @@ ynh_script_progression --message="Setting up source files..." --weight=2 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +#ynh_setup_source --dest_dir="$final_path" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +tempdir="$(mktemp -d)" + +ynh_setup_source --dest_dir=$tempdir --source_id=app + +ynh_exec_warn_less dpkg -i $tempdir/kiwiirc_20.05.24.1-1_amd64.deb + #================================================= #CREAT GATEWAYPATH #================================================= -ynh_script_progression --message="Setting up gatheway path..." --weight=2 +# ynh_script_progression --message="Setting up gatheway path..." --weight=2 -webircgateway_path=/var/www/webircgateway -mkdir -p $webircgateway_path +# webircgateway_path=/var/www/webircgateway +# mkdir -p $webircgateway_path -ynh_app_setting_set --app=$app --key=webircgateway_path --value=$webircgateway_path +# ynh_app_setting_set --app=$app --key=webircgateway_path --value=$webircgateway_path -mv ../sources/webircgateway/* $webircgateway_path +# mv ../sources/webircgateway/* $webircgateway_path -chmod 750 "$webircgateway_path" -chmod -R o-rwx "$webircgateway_path" -chown -R $app:www-data "$webircgateway_path" +# chmod 750 "$webircgateway_path" +# chmod -R o-rwx "$webircgateway_path" +# chown -R $app:www-data "$webircgateway_path" #================================================= # NGINX CONFIGURATION