From da65fa28adfdaab3cc26ab7d5f50647025ab6a98 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Mon, 21 May 2018 13:44:19 +0200 Subject: [PATCH] More silent install --- scripts/install | 10 +++++++--- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 442f50c..6d49eae 100644 --- a/scripts/install +++ b/scripts/install @@ -91,7 +91,7 @@ mkdir -p "$datadir" ynh_install_nodejs 8 # install yarn -wget https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb +wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb echo "96866d835da94a1f01a616f3d637c9100e826f65cb38a65e5d96ccf01ff6d692 yarn_1.6.0_all.deb" | sha256sum -c || ynh_die dpkg -i yarn_1.6.0_all.deb @@ -140,7 +140,7 @@ touch "$final_path/config/local-production.json" ( cd "$final_path" - yarn install --production --pure-lockfile --cache-folder /var/cache/yarn/ + yarn install --production --pure-lockfile --silent --cache-folder /var/cache/yarn/ ) #================================================= @@ -215,7 +215,11 @@ systemctl start "$app" #================================================= # we need to wait for the service to init peertube's database -(cd "/var/www/$app" && sleep 15 && exec /bin/sh -c "echo $admin_pass | NODE_CONFIG_DIR=/var/www/$app/config NODE_ENV=production PATH=/opt/node_n/bin:$PATH npm run reset-password -- -u root") +( + cd "$final_path" + sleep 15 + echo $admin_pass | NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production PATH="/opt/node_n/bin:$PATH" npm run reset-password -- -u root +) # Give permisiion to the final_path chown -R "$app":"$app" "$final_path" "$datadir" diff --git a/scripts/restore b/scripts/restore index 8c74333..999aebd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -94,7 +94,7 @@ chown -R "$app":"$app" "$datadir" # install nodejs ynh_install_nodejs 8 -wget https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb +wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb echo "96866d835da94a1f01a616f3d637c9100e826f65cb38a65e5d96ccf01ff6d692 yarn_1.6.0_all.deb" | sha256sum -c || ynh_die dpkg -i yarn_1.6.0_all.deb @@ -132,7 +132,7 @@ ynh_restore_file "/etc/logrotate.d/$app" ( cd "$final_path" - yarn install --production --pure-lockfile --cache-folder /var/cache/yarn/ + yarn install --production --pure-lockfile --silent --cache-folder /var/cache/yarn/ ) # Set right permissions for curl install diff --git a/scripts/upgrade b/scripts/upgrade index ae832c0..2e46b73 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,7 +85,7 @@ ynh_system_user_create "$app" ynh_install_nodejs 8 # install yarn -wget https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb +wget -nv https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb echo "96866d835da94a1f01a616f3d637c9100e826f65cb38a65e5d96ccf01ff6d692 yarn_1.6.0_all.deb" | sha256sum -c || ynh_die dpkg -i yarn_1.6.0_all.deb @@ -119,7 +119,7 @@ ynh_secure_remove "$tmpdir" ( cd "$final_path" - yarn install --production --pure-lockfile --cache-folder /var/cache/yarn/ + yarn install --production --pure-lockfile --silent --cache-folder /var/cache/yarn/ )