From 4f279503d1f87fddf021f7f48c3a5398142a03b1 Mon Sep 17 00:00:00 2001 From: Jocelyn Delalande Date: Sun, 25 Nov 2018 17:11:09 +0100 Subject: [PATCH] =?UTF-8?q?Switch=20to=20non-deprecated=20helper:=C2=A0che?= =?UTF-8?q?ckurl=20=E2=86=92=20ynh=5Fwebpath=5Fregister?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Iso-functionnal commit. Simply removes a warning. --- manifest.json | 2 +- scripts/install | 6 +----- scripts/restore | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 38a568a..79dc0bd 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "url": "http://jocelyn.delalande.fr" }, "requirements": { - "yunohost": ">= 2.4" + "yunohost": ">= 2.6.3" }, "multi_instance": false, "services": ["nginx", "mysql", "postfix"], diff --git a/scripts/install b/scripts/install index a30b6e1..8cdbe5c 100755 --- a/scripts/install +++ b/scripts/install @@ -25,11 +25,7 @@ db_user=ihatemoney secret_key=`openssl rand -base64 32` mails_sender="no-reply@${domain}" -sudo yunohost app checkurl $domain$path -a ihatemoney -if [[ ! $? -eq 0 ]]; then - ynh_die "${domain}${path} is not available" -fi - +ynh_webpath_register $app $domain $path # Configure database ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd" diff --git a/scripts/restore b/scripts/restore index a2f6a7c..8317037 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,8 +27,7 @@ fi source _common.sh -sudo yunohost app checkurl "${domain}${path}" -a "$app" \ - || ynh_die "The path ${domain}${path} is not available for app installation." +ynh_webpath_register $app $domain $path test -d $INSTALL_DIR && ynh_die \ "The destination directory '$INSTALL_DIR' already exists.\