[enh] set -e and trap

[enh] IGNORE when insert user in DB
[enh] Add upgrade scripts
[enh] Move upload dir in /home

hooks/post_user_create

@@ -2,4 +2,4 @@
 
 db_pwd=$(sudo cat /etc/yunohost/mysql)
 user=$1
-mysql -u root -p$db_pwd limesurvey -e "INSERT INTO prefix_users (users_name) VALUES ('$user');INSERT INTO prefix_permissions (entity,entity_id,uid,permission,create_p,read_p,update_p,delete_p,import_p,export_p) SELECT 'global',0,uid,'surveys',1,1,1,1,0,1 FROM prefix_users WHERE users_name='$user'"
+mysql -u root -p$db_pwd limesurvey -e "INSERT IGNORE INTO prefix_users (users_name) VALUES ('$user');INSERT IGNORE INTO prefix_permissions (entity,entity_id,uid,permission,create_p,read_p,update_p,delete_p,import_p,export_p) SELECT 'global',0,uid,'surveys',1,1,1,1,0,1 FROM prefix_users WHERE users_name='$user'"

scripts/install

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+set -e
+# Delete db and user if exit with an error
+function exit_properly 
+{
+    set +e
+    root_pwd=$(sudo cat /etc/yunohost/mysql)
+    mysql -u root -p$root_pwd -e "DROP DATABASE limesurvey ; DROP USER limesurvey@localhost ;"
+    sudo rm -Rf /var/www/limesurvey
+    exit 1
+}
 app="limesurvey"
 
 # Retrieve arguments
@@ -9,19 +19,17 @@ admin=$3
 language=$4
 
 # Check if admin exists
-sudo yunohost user list --json | grep -q "\"username\": \"$admin\""
+sudo yunohost user list --json | grep -qi "\"username\": \"$admin\"" \
-if [[ ! $? -eq 0 ]]; then
+	|| (echo "User does not exist: $admin" && exit 1)
-    echo "Wrong admin"
-    exit 1
-fi
 sudo yunohost app setting $app admin -v $admin
 sudo yunohost app setting $app language -v $language
 
 # Check domain/path availability
-sudo yunohost app checkurl $domain$path -a $app
+sudo yunohost app checkurl $domain$path -a $app \
-if [[ ! $? -eq 0 ]]; then
+	|| (echo "Path not available: $domain$path" && exit 1)
-    exit 1
+
-fi
+# Remove trailing "/" for next commands
+path=${path%/}
 
 # Generate random password
 db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
@@ -33,11 +41,19 @@ db_user=$app
 sudo yunohost app initdb $db_user -p $db_pwd
 sudo yunohost app setting $app mysqlpwd -v $db_pwd
 
+# Delete db and user if exit with an error
+trap exit_properly ERR
+
+    
 # Copy files to the right place
 final_path=/var/www/$app
+upload_path=/home/yunohost.app/$app/upload
 sudo mkdir -p $final_path
+sudo mkdir -p $upload_path
 sudo cp -a ../sources/* $final_path
-
+sudo rm -Rf $final_path/upload
+sudo cp -a ../sources/upload/* $upload_path
+sudo ln -s $upload_path ../sources/upload
 
 # Db installation
 mysql -u $db_user -p$db_pwd $db_user < ../sources/installer/sql/create-mysql.sql
@@ -54,23 +70,29 @@ sudo sed -i "s/yunobase/$db_user/g" $final_path/application/config/config.php
 for user in $(sudo yunohost user list | grep '^  [^ ]*:' | sed -e "s/^  \([^ ]*\):/\1/g")
 do
     if [ $user != $admin ];
-        then
+    then
-            mysql -u $db_user -p$db_pwd $db_user -e "INSERT INTO prefix_users (users_name) VALUES ('$user');INSERT INTO prefix_permissions (entity,entity_id,uid,permission,create_p,read_p,update_p,delete_p,import_p,export_p) SELECT 'global',0,uid,'surveys',1,1,1,1,0,1 FROM prefix_users WHERE users_name='$user'"
+        mysql -u $db_user -p$db_pwd $db_user -e "INSERT INTO prefix_users (users_name) VALUES ('$user');INSERT INTO prefix_permissions (entity,entity_id,uid,permission,create_p,read_p,update_p,delete_p,import_p,export_p) SELECT 'global',0,uid,'surveys',1,1,1,1,0,1 FROM prefix_users WHERE users_name='$user'"
-
+    fi
-        fi
 done
 
 # Set permissions
-sudo chown -R www-data: $final_path
+sudo chown -R www-data:www-data $final_path
+sudo chown -R www-data:www-data $upload_path
+sudo chmod -R 664 $final_path
+sudo find $final_path -type d -print0 | xargs -0 sudo chmod 775 \
+	|| echo "No file to modify"
+sudo chmod -R 664 $upload_path
+sudo find $upload_path -type d -print0 | xargs -0 sudo chmod 775 \
+	|| echo "No file to modify"
 sudo chmod u+w $final_path/tmp
-sudo chmod u+w $final_path/upload
+sudo chmod u+w $upload_path
 sudo chmod u+w $final_path/application/config/
 
 sudo yunohost app addaccess $app -u $admin
 
 # Modify Nginx configuration file and copy it to Nginx conf directory
-sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
+sudo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
-sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
+sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload

scripts/upgrade

@@ -1,3 +1,81 @@
 #!/bin/bash
 
+app="limesurvey"
+
+domain=$(sudo yunohost app setting $app domain)
+path=$(sudo yunohost app setting $app path)
+admin=$(sudo yunohost app setting $app admin)
+db_pwd=$(sudo yunohost app setting $app mysqlpwd)
+
+db_user=$app
+
+# Remove trailing "/" for next commands
+path=${path%/}
+
+final_path=/var/www/$app
+upload_path=/home/yunohost.app/$app/upload
+sudo mkdir -p $final_path
+sudo mkdir -p $upload_path
+
+# Backup config, plugins and themes and delete previous files
+sudo mv $final_path/application/config/config.php $final_path/
+old_pwd=$(pwd)
+cd $final_path
+sudo mkdir -p old_plugins
+sudo mv plugins/* old_plugins \
+    || echo "No app to backup"
+sudo mkdir -p old_themes
+sudo mv themes/* old_themes \
+    || echo "No themes to backup"
+
+if [ ! -h $final_path/upload ]; then
+    sudo mv $final_path/upload/* $upload_path/ \
+    || echo "No upload to move"
+fi
+shopt -s extglob
+sudo rm -Rf !(old_plugins|old_themes|config.php)
+shopt -u extglob
+
+# Copie new files and restore config, plugins and themes
+cd $old_pwd
+sudo cp -a ../sources/* $final_path
+cd $final_path/old_plugins
+sudo rm -Rf $(ls $final_path/plugins)
+cd $final_path/old_themes
+sudo rm -Rf $(ls $final_path/themes)
+cd $old_pwd
+sudo cp -a $final_path/old_plugins/* $final_path/plugins/ \
+    || echo "No plugin to restore"
+sudo cp -a $final_path/old_themes/* $final_path/themes/ \
+    || echo "No theme to restore"
+
+sudo mv $final_path/config.php $final_path/application/config/
+
+# Reset Upload symbolic link
+sudo rm -Rf $final_path/upload
+sudo ln -s $upload_path ../sources/upload
+
+
+# Create user
+for user in $(sudo yunohost user list | grep '^  [^ ]*:' | sed -e "s/^  \([^ ]*\):/\1/g")
+do
+    if [ $user != $admin ];
+    then
+        mysql -u $db_user -p$db_pwd $db_user -e "INSERT IGNORE INTO prefix_users (users_name) VALUES ('$user');INSERT IGNORE INTO prefix_permissions (entity,entity_id,uid,permission,create_p,read_p,update_p,delete_p,import_p,export_p) SELECT 'global',0,uid,'surveys',1,1,1,1,0,1 FROM prefix_users WHERE users_name='$user'"
+    fi
+done
+
+# Set permissions
+sudo chown -R www-data:www-data $final_path
+sudo chown -R www-data:www-data $upload_path
+sudo chmod -R 664 $final_path
+sudo find $final_path -type d -print0 | xargs -0 sudo chmod 775 \
+	|| echo "No file to modify"
+sudo chmod -R 664 $upload_path
+sudo find $upload_path -type d -print0 | xargs -0 sudo chmod 775 \
+	|| echo "No file to modify"
+sudo chmod u+w $final_path/tmp
+sudo chmod u+w $upload_path
+sudo chmod u+w $final_path/application/config/
+