From 3da966c982db12402c42fb4ef9ae059e02f36215 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 14 Apr 2019 00:46:46 +0200
Subject: [PATCH] Clean variables

---
 conf/logrotate.conf |  2 +-
 scripts/install     | 60 ++++++++++++++++++++++-----------------------
 scripts/remove      | 22 ++++++++---------
 scripts/upgrade     | 14 +++++------
 4 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/conf/logrotate.conf b/conf/logrotate.conf
index 3069a4d..5008367 100644
--- a/conf/logrotate.conf
+++ b/conf/logrotate.conf
@@ -8,7 +8,7 @@
         compress
         delaycompress
         postrotate
-        systemctl restart syncthing@SYNCUSER > /dev/null
+        systemctl restart syncthing@sync_user > /dev/null
         endscript
 }
 
diff --git a/scripts/install b/scripts/install
index 012ed62..8c5b1aa 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,27 +25,25 @@ ynh_abort_if_errors
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
-path=$YNH_APP_ARG_PATH
-user=$YNH_APP_ARG_ADMIN
+path_url=$YNH_APP_ARG_PATH
+admin=$YNH_APP_ARG_ADMIN
 channel=$YNH_APP_ARG_CHANNEL
 
 app=$YNH_APP_INSTANCE_NAME
 
 # Configurable variables
-SYNCHOME="/home/yunohost.app/$app"
-SYNCUSER=debian-syncthing
-SYNCPORT=22000
-GUIPORT=8384
+sync_home="/home/yunohost.app/$app"
+sync_user=debian-syncthing
+sync_port=22000
+gui_port=8384
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
 ynh_print_info "Validating installation parameters..."
 
-
-
 # Register (book) web path
-ynh_webpath_register $app $domain $path
+ynh_webpath_register $app $domain $path_url
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
@@ -53,11 +51,11 @@ ynh_webpath_register $app $domain $path
 ynh_print_info "Storing installation settings..."
 
 ynh_app_setting_set $app domain $domain
-ynh_app_setting_set $app path $path
-ynh_app_setting_set $app user $user
+ynh_app_setting_set $app path $path_url
+ynh_app_setting_set $app admin $admin
 ynh_app_setting_set $app channel $channel
-ynh_app_setting_set $app synchome $SYNCHOME
-ynh_app_setting_set $app syncuser $SYNCUSER
+ynh_app_setting_set $app sync_home $sync_home
+ynh_app_setting_set $app sync_user $sync_user
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -67,22 +65,22 @@ ynh_app_setting_set $app syncuser $SYNCUSER
 ynh_print_info "Configuring firewall..."
 
 # Check port availability
-sudo yunohost app checkport $GUIPORT
+sudo yunohost app checkport $gui_port
 if [[ ! $? -eq 0 ]]; then
-  echo Port $GUIPORT for Syncthing UI is not available.
+  echo Port $gui_port for Syncthing UI is not available.
   exit 1
 fi
-ynh_app_setting_set $app guiport $GUIPORT
+ynh_app_setting_set $app gui_port $gui_port
 
-sudo yunohost app checkport $SYNCPORT
+sudo yunohost app checkport $sync_port
 if [[ ! $? -eq 0 ]]; then
-  echo Port $SYNCPORT is for Syncthing protocol is not available.
+  echo Port $sync_port for Syncthing protocol is not available.
   exit 1
 fi
 
 # Open this port
-ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $SYNCPORT
-ynh_app_setting_set $app syncport $SYNCPORT
+ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $sync_port
+ynh_app_setting_set $app sync_port $sync_port
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -105,8 +103,8 @@ sudo apt-get install syncthing -y --force-yes
 ynh_print_info "Configuring nginx web server..."
 
 # Configure Nginx
-sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
-sed -i "s@PORTTOCHANGE@$GUIPORT@g" ../conf/nginx.conf
+sed -i "s@PATHTOCHANGE@$path_url@g" ../conf/nginx.conf
+sed -i "s@PORTTOCHANGE@$gui_port@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/syncthing.conf
 
 #=================================================
@@ -115,7 +113,7 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/syncthing.conf
 ynh_print_info "Configuring system user..."
 
 # Create a system user
-ynh_system_user_create --username=$SYNCUSER --home_dir=$SYNCHOME/ --use_shell
+ynh_system_user_create --username=$sync_user --home_dir=$sync_home/ --use_shell
 
 #=================================================
 # SPECIFIC SETUP
@@ -125,9 +123,9 @@ ynh_system_user_create --username=$SYNCUSER --home_dir=$SYNCHOME/ --use_shell
 ynh_print_info "Creating sync directory..."
 
 # Make directories and set rights
-sudo chown -R $SYNCUSER:$SYNCUSER $SYNCHOME/
-sudo find $SYNCHOME/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
-sudo find $SYNCHOME/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
+sudo chown -R $sync_user:$sync_user $sync_home/
+sudo find $sync_home/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
+sudo find $sync_home/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
 
 #=================================================
 # SETUP SYSTEMD
@@ -137,9 +135,9 @@ ynh_print_info "Configuring a systemd service..."
 # Install and monitor service
 sudo sed -i '/^\[Service\]$/,/^\[/ s/^Restart=on-failure/Restart=always/' /lib/systemd/system/syncthing@.service
 sudo systemctl daemon-reload
-sudo systemctl enable syncthing@$SYNCUSER.service
-sudo yunohost service add syncthing@$SYNCUSER -l /var/log/syncthing.log
-sudo systemctl start syncthing@$SYNCUSER.service
+sudo systemctl enable syncthing@$sync_user.service
+sudo yunohost service add syncthing@$sync_user -l /var/log/syncthing.log
+sudo systemctl start syncthing@$sync_user.service
 
 #=================================================
 # GENERIC FINALIZATION
@@ -149,7 +147,7 @@ sudo systemctl start syncthing@$SYNCUSER.service
 
 # Remove acces to all users
 sudo yunohost app removeaccess syncthing
-sudo yunohost app addaccess syncthing -u $user
+sudo yunohost app addaccess syncthing -u $admin
 
 #=================================================
 # SETUP LOGROTATE
@@ -158,7 +156,7 @@ ynh_print_info "Configuring log rotation..."
 
 # Configure logrotate if present
 if [ -d "/etc/logrotate.d" ]; then
-  sed -i "s@SYNCUSER@$SYNCUSER@g" ../conf/logrotate.conf
+  sed -i "s@sync_user@$sync_user@g" ../conf/logrotate.conf
   sudo cp ../conf/logrotate.conf /etc/logrotate.d/syncthing
   sudo chmod 0644 /etc/logrotate.d/syncthing
 fi
diff --git a/scripts/remove b/scripts/remove
index b3ecd33..1bf9f95 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -18,10 +18,10 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get $app domain)
 
-SYNCHOME=$(ynh_app_setting_get $app synchome)
-SYNCUSER=$(ynh_app_setting_get $app syncuser)
-SYNCPORT=$(ynh_app_setting_get $app syncport)
-GUIPORT=$(ynh_app_setting_get $app guiport)
+sync_home=$(ynh_app_setting_get $app sync_home)
+sync_user=$(ynh_app_setting_get $app sync_user)
+sync_port=$(ynh_app_setting_get $app sync_port)
+gui_port=$(ynh_app_setting_get $app gui_port)
 
 final_path=$(ynh_app_setting_get $app final_path)
 
@@ -31,9 +31,9 @@ final_path=$(ynh_app_setting_get $app final_path)
 ynh_print_info "Stopping and removing the systemd service"
 
 # Remove the dedicated systemd config
-sudo systemctl stop syncthing@$SYNCUSER.service
+sudo systemctl stop syncthing@$sync_user.service
 sudo yunohost service remove syncthing
-sudo systemctl disable syncthing@$SYNCUSER.service
+sudo systemctl disable syncthing@$sync_user.service
 
 #=================================================
 # REMOVE DEPENDENCIES
@@ -48,9 +48,9 @@ sudo apt-get autoremove syncthing -y --purge
 sudo rm /etc/apt/sources.list.d/syncthing.list
 sudo apt-get update -qq
 
-# Backup syncthing SYNCHOME directory
-sudo mv $SYNCHOME $SYNCHOME.old
-# sudo rm -rf $SYNCHOME
+# Backup syncthing sync_home directory
+sudo mv $sync_home $sync_home.old
+# sudo rm -rf $sync_home
 
 
 
@@ -85,7 +85,7 @@ fi
 #=================================================
 
 # Close port in firewall
-sudo yunohost firewall disallow TCP $SYNCPORT
+sudo yunohost firewall disallow TCP $sync_port
 
 #=================================================
 # GENERIC FINALIZATION
@@ -95,7 +95,7 @@ sudo yunohost firewall disallow TCP $SYNCPORT
 ynh_print_info "Removing the dedicated system user"
 
 # Delete a system user
-sudo userdel $SYNCUSER
+sudo userdel $sync_user
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index 806b131..5f71b87 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,14 +17,14 @@ ynh_print_info "Loading installation settings..."
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get $app domain)
-path=$(ynh_app_setting_get $app path)
+path_url=$(ynh_app_setting_get $app path)
 
 final_path=$(ynh_app_setting_get $app final_path)
 
-SYNCHOME=$(ynh_app_setting_get $app synchome)
-SYNCUSER=$(ynh_app_setting_get $app syncuser)
-SYNCPORT=$(ynh_app_setting_get $app syncport)
-GUIPORT=$(ynh_app_setting_get $app guiport)
+sync_home=$(ynh_app_setting_get $app sync_home)
+sync_user=$(ynh_app_setting_get $app sync_user)
+sync_port=$(ynh_app_setting_get $app sync_port)
+gui_port=$(ynh_app_setting_get $app gui_port)
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -45,8 +45,8 @@ sudo apt-get upgrade syncthing -y
 #=================================================
 ynh_print_info "Upgrading nginx web server configuration..."
 
-sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
-sed -i "s@PORTTOCHANGE@$GUIPORT@g" ../conf/nginx.conf
+sed -i "s@PATHTOCHANGE@$path_url@g" ../conf/nginx.conf
+sed -i "s@PORTTOCHANGE@$gui_port@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/syncthing.conf