cleaning

manifest.toml

@@ -18,7 +18,7 @@ demo = "https://send.vis.ee/"
 code = "https://github.com/timvisee/send"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.30"
 helpers_version = "2.1"
 architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true

scripts/backup

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

scripts/change_url

@@ -17,8 +17,6 @@ ynh_script_progression "Updating NGINX web server configuration..."
 
 ynh_config_change_url_nginx
 
-#=================================================
-# SPECIFIC MODIFICATIONS
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -27,15 +25,14 @@ ynh_script_progression "Adding $app's configuration..."
 domain=$new_domain
 ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
-#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/server/config.js"
+#chmod 400 "$install_dir/server/config.js"
-#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/server/config.js"
+#chown "$app:$app" "$install_dir/server/config.js"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-# Start a systemd service
 ynh_systemctl --service="$app" --action="start" --log_path="systemd"
 
 #=================================================

scripts/install

@@ -15,7 +15,6 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Creating a Redis database..."
 
-# Configure redis
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --key=redis_db --value="$redis_db"
 
@@ -24,11 +23,10 @@ ynh_app_setting_set --key=redis_db --value="$redis_db"
 #=================================================
 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 | chmod -R o-rwx "$install_dir"
+#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:www-data" "$install_dir"
+#chown -R "$app:www-data" "$install_dir"
 chmod +x "$install_dir/server/bin/prod.js"
 
 #=================================================
@@ -36,10 +34,8 @@ chmod +x "$install_dir/server/bin/prod.js"
 #=================================================
 ynh_script_progression "Configuring NGINX web server..."
 
-# Create a dedicated NGINX config
 ynh_config_add_nginx
 
-# Create a dedicated systemd config
 ynh_config_add_systemd
 
 yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log"
@@ -51,8 +47,8 @@ ynh_script_progression "Adding $app's configuration..."
 
 ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
-#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/server/config.js"
+#chmod 400 "$install_dir/server/config.js"
-#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:" "$install_dir/server/config.js"
+#chown "$app:" "$install_dir/server/config.js"
 
 #=================================================
 # SPECIFIC SETUP
@@ -62,9 +58,8 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config.
 ynh_script_progression "Building app... (this will take some time and resources!)"
 
 pushd "$install_dir"
-
+	ynh_hide_warnings ynh_exec_as_app npm install
-	ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install
+	ynh_hide_warnings ynh_exec_as_app npm run build
-	ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build
 popd
 
 #=================================================
@@ -72,7 +67,6 @@ popd
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-# Start a systemd service
 ynh_systemctl --service="$app" --action="start" --log_path="systemd"
 
 #=================================================

scripts/remove

@@ -8,19 +8,16 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression "Removing system configurations related to $app..."
 
-# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_hide_warnings yunohost service status "$app" >/dev/null
 then
 	ynh_script_progression "Removing $app service integration..."
 	yunohost service remove "$app"
 fi
 
-# Remove the dedicated systemd config
 ynh_config_remove_systemd
 
 ynh_redis_remove_db "$redis_db"
 
-# Remove the dedicated NGINX config
 ynh_config_remove_nginx
 
 ynh_nodejs_remove

scripts/restore

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -11,8 +10,8 @@ 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"
+#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:www-data" "$install_dir"
+#chown -R "$app:www-data" "$install_dir"
 chmod +x "$install_dir/server/bin/prod.js"
 
 #=================================================

scripts/upgrade

@@ -22,11 +22,10 @@ ynh_config_remove_logrotate
 #=================================================
 ynh_script_progression "Upgrading source files..."
 
-# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_replace
-ynh_setup_source --dest_dir="$install_dir" --keep="server/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"
+#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:www-data" "$install_dir"
+#chown -R "$app:www-data" "$install_dir"
 chmod +x "$install_dir/server/bin/prod.js"
 
 #=================================================
@@ -41,10 +40,8 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Upgrading NGINX web server configuration..."
 
-# Create a dedicated NGINX config
 ynh_config_add_nginx
 
-# Create a dedicated systemd config
 ynh_config_add_systemd
 
 yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log"
@@ -56,8 +53,8 @@ ynh_script_progression "Updating configuration..."
 
 ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
-#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/server/config.js"
+#chmod 400 "$install_dir/server/config.js"
-#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:" "$install_dir/server/config.js"
+#chown "$app:" "$install_dir/server/config.js"
 
 #=================================================
 # BUILD APP
@@ -65,9 +62,8 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config.
 ynh_script_progression "Building app... (this will take some time and resources!)"
 
 pushd "$install_dir"
-
+	ynh_hide_warnings ynh_exec_as_app npm install
-	ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install
+	ynh_hide_warnings ynh_exec_as_app npm run build
-	ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build
 popd
 
 #=================================================