From 9c72ea73d0eee90f97bd6d4650e5c66cbe7cb33c Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Tue, 29 Oct 2013 13:51:24 +0000
Subject: [PATCH] Bugfixes

---
 scripts/install | 25 ++++++++++++++++---------
 scripts/upgrade | 10 +++++-----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index 871dd0f..e5fc7a9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -5,16 +5,25 @@ domain=$1
 path=$2
 
 sudo yunohost app checkurl $domain$path -a transmission
-if [[ ! $? -eq 0 ]]; then exit 1 fi
+if [[ ! $? -eq 0 ]]; then 
+  exit 1
+fi
 
 # Remove trailing "/" for next commands
 path=${path%/}
 
 # Check port availability
 sudo yunohost app checkport 9091
-if [[ ! $? -eq 0 ]]; then exit 1 fi
+if [[ ! $? -eq 0 ]]; then
+  exit 1 
+fi
 sudo yunohost app checkport 51413
-if [[ ! $? -eq 0 ]]; then exit 1 fi
+if [[ ! $? -eq 0 ]]; then 
+  exit 1 
+fi
+
+# Open port in firewall
+sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
 
 # Install official debian package
 sudo apt-get install transmission-daemon -y -qq 
@@ -25,14 +34,12 @@ sudo chgrp debian-transmission /home/yunohost.transmission/{progress,completed}
 sudo chmod 770 -R /home/yunohost.transmission/{progress,completed}
 
 # Configure Transmission and reload
-sed -i "s@/PATHTOCHANGE@$path@g" ../conf/settings.json
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/settings.json
 sudo cp ../conf/settings.json /etc/transmission-daemon/settings.json
 sudo service transmission-daemon reload
 
-# Open port in firewall
-sudo yunohost firewall allow TCP 51413
-
 # Configure Nginx and reload
-sed -i "s@/PATHTOCHANGE@$path@g" ../conf/nginx.conf
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/transmission.conf
-sudo service nginx reload 
+sudo service nginx reload
+echo $?
diff --git a/scripts/upgrade b/scripts/upgrade
index 29c67b5..99f61af 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -7,6 +7,9 @@ path=$(sudo yunohost app setting transmission path)
 # Remove trailing "/" for next commands
 path=${path%/}
 
+# Open port in firewall
+sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
+
 # Upgrade official debian package
 sudo apt-get install transmission-daemon -y -qq 
 
@@ -16,14 +19,11 @@ sudo chgrp debian-transmission /home/yunohost.transmission/{progress,completed}
 sudo chmod 770 -R /home/yunohost.transmission/{progress,completed}
 
 # Configure Transmission and reload
-sed -i "s@/PATHTOCHANGE@$path@g" ../conf/settings.json
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/settings.json
 sudo cp ../conf/settings.json /etc/transmission-daemon/settings.json
 sudo service transmission-daemon reload
 
-# Open port in firewall
-sudo yunohost firewall allow TCP 51413 > /dev/null 2>&1
-
 # Configure Nginx and reload
-sed -i "s@/PATHTOCHANGE@$path@g" ../conf/nginx.conf
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/transmission.conf
 sudo service nginx reload