From d82ba6b37d9cafb1a086a36c1e0eaf3637eae87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:39:30 +0200 Subject: [PATCH] cleaning --- manifest.toml | 2 +- scripts/_common.sh | 2 +- scripts/install | 4 ---- scripts/restore | 2 -- scripts/upgrade | 4 ---- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4187c94..19e1a38 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ code = "https://github.com/mongo-express/mongo-express" cpe = "cpe:2.3:a:mongo-express_project:mongo-express" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = ["amd64"] multi_instance = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 4792ef0..2d4d5fd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ nodejs_version=16 mongo_version=6.0 _install_yarn () { - ynh_exec_as_app node_load_PATH" npm install yarn + ynh_exec_as_app npm install yarn ynh_yarn="$install_dir/node_modules/.bin/yarn" alias ynh_yarn="$ynh_yarn" } diff --git a/scripts/install b/scripts/install index 230d74a..78bfbde 100755 --- a/scripts/install +++ b/scripts/install @@ -29,11 +29,7 @@ ynh_setup_source --dest_dir="$install_dir" cp "$install_dir/config.default.js" "$install_dir/config.js" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir" ynh_config_add --template=".env" --destination="$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "$install_dir/.env" #================================================= # BUILD NODEJS CODE diff --git a/scripts/restore b/scripts/restore index faf5ee7..655f02b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,8 +11,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:$app "$install_dir" #================================================= # REINSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 87b57f0..1dd0c83 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,11 +36,7 @@ ynh_setup_source --full_replace --dest_dir="$install_dir" cp "$install_dir/config.default.js" "$install_dir/config.js" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir" ynh_config_add --template=".env" --destination="$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "$install_dir/.env" #================================================= # BUILD NODEJS CODE