From 45034d51f04cf8a9970fb7933a2fd56df5187ba7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 22:33:16 +0100 Subject: [PATCH 1/2] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 1dc57bb..432f317 100644 --- a/scripts/install +++ b/scripts/install @@ -76,7 +76,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=20 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +#ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # CREATE DEDICATED USER @@ -136,8 +136,8 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs - ynh_exec_warn_less yarn install --allow-root - yarn global add bower + ynh_exec_warn_less npm install --allow-root + npm install -g bower bower install --allow-root popd || ynh_die From 5c65c813b9f1cfa7705eb6685da265410ad81489 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jan 2021 22:38:43 +0100 Subject: [PATCH 2/2] Remove Yarn --- manifest.json | 2 +- scripts/change_url | 4 ++-- scripts/install | 7 ++----- scripts/restore | 3 --- scripts/upgrade | 5 +---- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/manifest.json b/manifest.json index 72f56ee..6d1e6db 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative editor", "fr": "Éditeur chiffré collaboratif en temps réel." }, - "version": "4.0.0~ynh1", + "version": "4.0.0~ynh2", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": { diff --git a/scripts/change_url b/scripts/change_url index 7de1f4a..eab8900 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -69,7 +69,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -107,7 +107,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available" +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="server available" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 432f317..94bef7b 100644 --- a/scripts/install +++ b/scripts/install @@ -75,9 +75,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=20 # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Install Yarn -#ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - #================================================= # CREATE DEDICATED USER #================================================= @@ -137,8 +134,8 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs ynh_exec_warn_less npm install --allow-root - npm install -g bower - bower install --allow-root + ynh_exec_warn_less npm install -g bower + ynh_exec_warn_less bower install --allow-root popd || ynh_die #================================================= diff --git a/scripts/restore b/scripts/restore index 676dc1f..be98399 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,9 +80,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7 # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ddcd909..3d417e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,9 +102,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=6 # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - #================================================= # CREATE DEDICATED USER #================================================= @@ -135,7 +132,7 @@ ynh_store_file_checksum "$final_path/config/config.js" ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 pushd "$final_path" || ynh_die - bower update --allow-root + ynh_exec_warn_less bower update --allow-root popd || ynh_die #=================================================