Upgrade to 2.1.13

README.md

@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Luckysheet is an online spreadsheet that is powerful, simple to configure, and completely open source.
 
-**Shipped version:** 2.0.0
+**Shipped version:** 2.1.13
 
 ## Screenshot
 

README_fr.md

@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer et complètement open source.
 
-**Version incluse :** 2.0.0
+**Version incluse :** 2.1.13
 
 ## Captures d'écran
 

manifest.json

@@ -6,14 +6,14 @@
         "en": "Online spreadsheet that is powerful, simple to configure, and completely open source.",
         "fr": "Feuille de calcul en ligne, puissante, simple à configurer et entièrement open source."
     },
-    "version": "2.0.0~ynh3",
+    "version": "2.1.13~ynh1",
     "url": "https://github.com/mengshukeji/Luckysheet",
     "license": "MIT",
     "maintainer": {
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": false,
     "services": [

scripts/install

@@ -84,6 +84,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir=$final_path
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -121,16 +125,6 @@ ynh_replace_string --match_string="__YNH_NPM__" --replace_string="$ynh_npm" --ta
 
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Securing files and directories..." --weight=1
-
-# Set permissions to app files
-chown -R $app: $final_path
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================

scripts/restore

@@ -49,6 +49,14 @@ ynh_script_progression --message="Restoring the NGINX configuration..." --weight
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -56,21 +64,9 @@ ynh_script_progression --message="Restoring Luckysheet main directory..." --weig
 
 ynh_restore_file --origin_path="$final_path"
 
-#=================================================
+chmod 750 "$final_path"
-# RECREATE THE DEDICATED USER
+chmod -R o-rwx "$final_path"
-#=================================================
+chown -R $app:www-data "$final_path"
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
-#=================================================
-# RESTORE USER RIGHTS
-#=================================================
-ynh_script_progression --message="Restoring user rights..." --weight=1
-
-# Restore permissions on app files
-chown -R $app: $final_path
 
 #=================================================
 # SPECIFIC RESTORATION

scripts/upgrade

@@ -86,6 +86,10 @@ then
 	ynh_setup_source --dest_dir=$final_path
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -111,11 +115,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20
 
-	pushd "$final_path" || ynh_die
+	pushd "$final_path"
 		ynh_use_nodejs
 		ynh_npm install
 		ynh_npm install gulp -g
-	popd || ynh_die
+	popd
 fi
 
 #=================================================