From a3d885786bb639bfbb16e7533f9ec0cfa9db69d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 31 Jul 2024 23:17:04 +0200 Subject: [PATCH] cleaning --- manifest.toml | 2 +- scripts/install | 7 ------- scripts/remove | 1 - scripts/restore | 1 - scripts/upgrade | 3 --- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index d866b20..03a0b4b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://niek.github.io/chatgpt-web/" code = "https://github.com/Niek/chatgpt-web" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.20" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index bf69b90..4f37ff9 100755 --- a/scripts/install +++ b/scripts/install @@ -17,16 +17,13 @@ ynh_nodejs_install #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$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:www-data "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config using the conf/nginx.conf template ynh_config_add_nginx #================================================= @@ -38,9 +35,6 @@ ynh_script_progression "Adding $app's configuration..." 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" - #================================================= # SPECIFIC SETUP #================================================= @@ -49,7 +43,6 @@ ynh_config_add --template=".env" --destination="$install_dir/.env" ynh_script_progression "Building app... (this will take some time and resources!)" pushd "$install_dir" - ynh_hide_warnings ynh_exec_as_app node_load_PATH npm ci ynh_hide_warnings ynh_exec_as_app node_load_PATH npm run build popd diff --git a/scripts/remove b/scripts/remove index 64773d2..fc3c427 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ source /usr/share/yunohost/helpers # REMOVE SYSTEM CONFIGURATIONS #================================================= # REMOVE SYSTEMD SERVICE - #================================================= ynh_script_progression "Removing system configurations related to $app..." diff --git a/scripts/restore b/scripts/restore index 38be315..65f46d5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,7 +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 | chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c892a4c..8df61fc 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,10 +10,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace --keep = ".env" -#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:www-data "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= @@ -22,7 +20,6 @@ ynh_script_progression "Upgrading system configurations related to $app..." ynh_config_add_nginx pushd "$install_dir" - ynh_hide_warnings ynh_exec_as_app node_load_PATH npm ci ynh_hide_warnings ynh_exec_as_app node_load_PATH npm run build popd