From f506747facea0f38b9180b3014399b88c0b8e79b Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Fri, 18 Mar 2016 17:31:44 +0100 Subject: [PATCH] [enh] Support new env. vars. in install script --- manifest.json | 2 +- scripts/install | 20 +++++++++++++++----- scripts/upgrade | 3 ++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 3b4060b..13bd8af 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ "email": "john.doe@example.com", "url": "http://example.com" }, - "multi_instance": "false", + "multi_instance": "true", "services": [ "nginx", "php5-fpm", diff --git a/scripts/install b/scripts/install index 118bbce..8963e29 100755 --- a/scripts/install +++ b/scripts/install @@ -3,13 +3,23 @@ # causes the shell to exit if any subcommand or pipeline returns a non-zero status set -e -app=ynhexample +# This is a multi-instance app, meaning it can be installed several times independently +# The id of the app as stated in the manifest is available as $YNH_APP_ID +# The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) +# The app instance name is available as $YNH_APP_INSTANCE_NAME +# - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample +# - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 +# - ynhexample__{N} for the subsequent installations, with N=3,4, ... +# The app instance name is probably what you are interested the most, since this is +# guaranteed to be unique. This is a good unique identifier to define installation path, +# db names, ... +app=$YNH_APP_INSTANCE_NAME # Retrieve arguments -domain=$1 -path=$2 -admin=$3 -is_public=$4 +domain=$YNH_APP_ARG_DOMAIN +path=$YNH_APP_ARG_PATH +admin=$YNH_APP_ARG_ADMIN +is_public=$YNH_APP_ARG_IS_PUBLIC # Save app settings sudo yunohost app setting $app admin -v "$admin" diff --git a/scripts/upgrade b/scripts/upgrade index e490def..07c7daf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,7 +3,8 @@ # causes the shell to exit if any subcommand or pipeline returns a non-zero status set -e -app=ynhexample +# See comments in install script +app=$YNH_APP_INSTANCE_NAME # Retrieve arguments domain=$(sudo yunohost app setting $app domain)