cleaning

manifest.toml

@@ -16,7 +16,7 @@ demo = "http://strut.io/dist/"
 code = "https://github.com/MohannadNaj/Strut"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true

scripts/_common.sh

@@ -3,7 +3,3 @@
 #=================================================
 # COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================

scripts/install

@@ -14,9 +14,6 @@ ynh_setup_source --dest_dir="$tmp_dir"
 cp -a "$tmp_dir/dist/."  "$install_dir/"
 ynh_safe_rm "$tmp_dir"
 
-# Set permissions on app files
-#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"
-#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 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
 #=================================================
@@ -24,11 +21,8 @@ find "$install_dir" -type d -print0 | xargs -0 chmod 750
 #=================================================
 ynh_script_progression "Configuring NGINX web server..."
 
-# Create a dedicated NGINX config
 ynh_config_add_nginx
 
-#=================================================
-# SPECIFIC SETUP
 #=================================================
 # PATCH SOURCE
 #=================================================

scripts/remove

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -8,7 +7,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression "Removing NGINX web server configuration..."
 
-# Remove the dedicated NGINX config
 ynh_config_remove_nginx
 
 #=================================================

scripts/restore

@@ -3,8 +3,6 @@
 # source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
@@ -23,9 +21,6 @@ ynh_restore "$install_dir"
 # RESTORE USER RIGHTS
 #=================================================
 
-# Restore permissions on app files
-#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"
-#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 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
 #=================================================

scripts/upgrade

@@ -6,50 +6,33 @@ source /usr/share/yunohost/helpers
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression "Upgrading source files..."
 
-# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed
+tmp_dir=$(mktemp -d)
-if ynh_app_upstream_version_changed
-then
-	ynh_script_progression "Upgrading source files..."
 
-	# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$tmp_dir"
-	# For this app sources are in app subdirectory
 
-	tmp_dir=$(mktemp -d)
+cp -a "$tmp_dir/dist/."  "$install_dir/"
-
+ynh_safe_rm "$tmp_dir"
-	ynh_setup_source --dest_dir="$tmp_dir"
-	# Dist is the compiled version. Other directories are source code and tools to build the program
-	cp -a "$tmp_dir/dist/."  "$install_dir/"
-	ynh_safe_rm "$tmp_dir"
-fi
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
 ynh_script_progression "Upgrading NGINX web server configuration..."
 
-# Create a dedicated nginx config
 ynh_config_add_nginx
 
 #=================================================
 # PATCH SOURCE
 #=================================================
-
+# Imgur is deactivated on the specific upstream selected, but this text is still here
-# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed
+# Don't use a patch because it's minified js
-if ynh_app_upstream_version_changed
+ynh_replace --match="are currently uploaded to imgur.*re working on changing this" --replace="size is limited" --file="$install_dir/scripts/amd-app.js"
-then
-	# Imgur is deactivated on the specific upstream selected, but this text is still here
-	# Don't use a patch because it's minified js
-	ynh_replace --match="are currently uploaded to imgur.*re working on changing this" --replace="size is limited" --file="$install_dir/scripts/amd-app.js"
-fi
 
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-# Set permissions on app files
-#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"
-#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 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
 #=================================================