From 4960956a5f27530eab8b77e776542eb39633e1f7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 May 2021 21:08:03 +0200 Subject: [PATCH 1/2] Remove not needed pth_url --- scripts/install | 5 ----- scripts/restore | 1 - 2 files changed, 6 deletions(-) diff --git a/scripts/install b/scripts/install index 0a5751e..6db333d 100755 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,6 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC game=$YNH_APP_ARG_GAME pvp=$YNH_APP_ARG_PVP @@ -42,16 +41,12 @@ ynh_script_progression --message="Validating installation parameters..." final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=game --value=$game ynh_app_setting_set --app=$app --key=pvp --value=$pvp ynh_app_setting_set --app=$app --key=creative --value=$creative diff --git a/scripts/restore b/scripts/restore index 90c086d..195f489 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,7 +27,6 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) home_path=$(ynh_app_setting_get --app=$app --key=home_path) port=$(ynh_app_setting_get --app=$app --key=port) From cae17552033414d65bb8a95d6737dc9bb61dd5bf Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 May 2021 21:12:05 +0200 Subject: [PATCH 2/2] Less warning --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 6db333d..409a9c3 100755 --- a/scripts/install +++ b/scripts/install @@ -138,9 +138,9 @@ else fi pushd $final_path - cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE + ynh_exec_warn_less cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE - make -j$(nproc) + ynh_exec_warn_less make -j$(nproc) popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c9a8cb3..7f3e463 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -159,9 +159,9 @@ else fi pushd $final_path - cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE + ynh_exec_warn_less cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE - make -j$(nproc) + ynh_exec_warn_less make -j$(nproc) popd #=================================================