diff --git a/manifest.json b/manifest.json index 63815e6..97191c7 100644 --- a/manifest.json +++ b/manifest.json @@ -31,11 +31,12 @@ "install" : [ { "name": "domain", - "type": "domain" + "type": "domain", + "example": "domain.org" }, { "name": "path", - "type": "path", + "type": "path", "example": "/blog", "default": "/blog" }, diff --git a/scripts/install b/scripts/install index 9481c2d..c8ee86f 100644 --- a/scripts/install +++ b/scripts/install @@ -129,12 +129,12 @@ ynh_script_progression --message="Building $app... (this will take some time and pushd "$final_path" || ynh_die ynh_use_nodejs - ynh_exec_warn_less yarn install --non-interactive --silent - ynh_exec_warn_less yarn global add knex-migrator - ynh_exec_warn_less NODE_ENV=production knex-migrator init - ynh_exec_warn_less yarn global add grunt-cli ember-cli - ynh_exec_warn_less NODE_ENV=production grunt symlink - ynh_exec_warn_less NODE_ENV=production grunt init --force + yarn install --non-interactive --silent + yarn global add knex-migrator + NODE_ENV=production knex-migrator init + yarn global add grunt-cli ember-cli + NODE_ENV=production grunt symlink + NODE_ENV=production grunt init --force popd || ynh_die diff --git a/scripts/restore b/scripts/restore index 405d5e9..68709ce 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,6 +39,8 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= ynh_script_progression --message="Validating restoration parameters..." +ynh_webpath_available --domain=$domain --path_url=$path_url \ + || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index a2af1bc..cf364d6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,12 +156,12 @@ then ynh_script_progression --message="Building $app... (this will take some time and resources!)" pushd "$final_path" || ynh_die - ynh_exec_warn_less yarn install - ynh_exec_warn_less yarn global add knex-migrator - ynh_exec_warn_less NODE_ENV=production knex-migrator init - ynh_exec_warn_less yarn global add grunt - ynh_exec_warn_less NODE_ENV=production grunt symlink - ynh_exec_warn_less NODE_ENV=production grunt init --force + yarn install + yarn global add knex-migrator + NODE_ENV=production knex-migrator init + yarn global add grunt + NODE_ENV=production grunt symlink + NODE_ENV=production grunt init --force popd || ynh_die fi