From 6d15a15a017f22a6aec5c744496961e377f44d6e Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rault <par@rigelk.eu>
Date: Tue, 13 Dec 2016 16:12:58 +0100
Subject: [PATCH] fixed a forgotten import of the script helper and removed
 sudo before helpers

---
 scripts/install |  6 +++---
 scripts/remove  |  5 ++++-
 scripts/upgrade | 15 +++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0392e27..2deb310 100644
--- a/scripts/install
+++ b/scripts/install
@@ -21,11 +21,11 @@ db_user=ffsync
 
 # Initialize database and store mysql password for upgrade
 sudo yunohost app initdb $db_user -p $db_pwd
-sudo ynh_app_setting_set ffsync mysqlpwd $db_pwd
+ynh_app_setting_set ffsync mysqlpwd $db_pwd
 
 # Generate random password and save
 secret=$(head -c 20 /dev/urandom | sha1sum | cut -d " " -f1)
-sudo ynh_app_setting_set ffsync secret $secret
+ynh_app_setting_set ffsync secret $secret
 
 # Check depends installation
 sudo apt-get install make python-dev python-virtualenv -y
@@ -96,4 +96,4 @@ sudo service ffsync restart
 sudo yunohost app ssowatconf
 sudo service nginx restart
 sudo yunohost service add ffsync -l /var/log/ffsync.log
-sudo ynh_app_setting_set ffsync skipped_uris "/"
+ynh_app_setting_set ffsync skipped_uris "/"
diff --git a/scripts/remove b/scripts/remove
index 04429b0..984aad9 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,9 +1,12 @@
 #!/bin/bash
 
+# Source app helpers
+. /usr/share/yunohost/helpers
+
 db_user=ffsync
 db_name=ffsync
 root_pwd=$(sudo cat /etc/yunohost/mysql)
-domain=$(sudo ynh_app_setting_get ffsync domain)
+domain=$(ynh_app_setting_get ffsync domain)
 
 mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
 sudo rm -rf /opt/yunohost/ffsync
diff --git a/scripts/upgrade b/scripts/upgrade
index da31a1b..e4fa985 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,19 +1,22 @@
 #!/bin/bash
 
+# Source app helpers
+. /usr/share/yunohost/helpers
+
 # Retrieve arguments
-domain=$(sudo ynh_app_setting_get ffsync domain)
-path=$(sudo ynh_app_setting_get ffsync path)
-db_pwd=$(sudo ynh_app_setting_get ffsync mysqlpwd)
+domain=$(ynh_app_setting_get ffsync domain)
+path=$(ynh_app_setting_get ffsync path)
+db_pwd=$(ynh_app_setting_get ffsync mysqlpwd)
 db_user=ffsync
 final_path=/opt/yunohost/ffsync
 
 # Get secret variable
-secret=$(sudo ynh_app_setting_get ffsync secret)
+secret=$(ynh_app_setting_get ffsync secret)
 # Get from conf file if not defined
 if [[ -z $secret ]]
 then
 	secret=$(sudo grep "secret =" $final_path/syncserver.ini | cut -d" " -f3)
-	sudo ynh_app_setting_set ffsync secret $secret
+	ynh_app_setting_set ffsync secret $secret
 fi
 
 # Check Swap
@@ -81,5 +84,5 @@ sudo service ffsync restart
 
 # Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload
-sudo ynh_app_setting_set ffsync skipped_uris "/"
+ynh_app_setting_set ffsync skipped_uris "/"
 sudo yunohost app ssowatconf