From 79c398d7d9c876f833cfd9a084d2455f73cc3ef3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 29 Sep 2021 09:41:06 +0200 Subject: [PATCH 1/3] Revert "Remove ynh_webpath_available in restore" This reverts commit 70569f7067a5ec2e858ce612217a2ac2096465e6. --- scripts/restore | 2 ++ 1 file changed, 2 insertions(+) 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 " From 4d3d547addf34b1b57e31c8332a11caaf30a5e5a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 29 Sep 2021 09:41:06 +0200 Subject: [PATCH 2/3] Revert "Remove superfluous example in manifest" This reverts commit b72eb99ed18f6a98ff15da7d149b5cf554130689. --- manifest.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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" }, From 163b1b4575a1640721f869f54f39eebc88d57ce3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 29 Sep 2021 09:41:06 +0200 Subject: [PATCH 3/3] Revert "Silence all build warnings" This reverts commit dc861dc08a7eff112c9fa12a9e4e871ce503c7fe. --- scripts/install | 12 ++++++------ scripts/upgrade | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) 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/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