Browse Source

Improve upgrade script

Julien VAUBOURG 9 years ago
parent
commit
33cce740f0
2 changed files with 6 additions and 5 deletions
  1. 5 5
      scripts/install
  2. 1 0
      scripts/remove

+ 5 - 5
scripts/install

@@ -33,14 +33,14 @@ if ! $upgrade; then
   ynh_version=$(sudo dpkg -l yunohost | grep ii | awk '{ print $3 }' | sed 's/\.//g')
   
   if [ "${ynh_version}" -lt 220 ]; then
-    echo "ERROR: You need a YunoHost version equals or greater than 2.2.0"
+    echo "ERROR: You need a YunoHost version equals or greater than 2.2.0" >&2
     exit 1
   fi
   
   sudo systemctl is-active dnsmasq &> /dev/null
   
   if [ $? -ne 0 ]; then
-    echo "ERROR: You need to enable dnsmasq instead of bind9 (apt-get remove bind9 && systemctl start dnsmasq)"
+    echo "ERROR: You need to enable dnsmasq instead of bind9 (apt-get remove bind9 && systemctl start dnsmasq)" >&2
     exit 1
   fi
   
@@ -209,12 +209,12 @@ if [ "${ip6_addr}" != none ]; then
 fi
 
 sudo systemctl enable ynh-hotspot
+sudo yunohost service add ynh-hotspot
 
 if ! $upgrade; then
   sudo systemctl start ynh-hotspot
-
-  sudo yunohost service add ynh-hotspot
-  sudo yunohost app ssowatconf
 fi
 
+sudo yunohost app ssowatconf
+
 exit 0

+ 1 - 0
scripts/remove

@@ -23,6 +23,7 @@ domain=$(sudo yunohost app setting hotspot domain)
 # The End
 sudo systemctl stop ynh-hotspot
 sudo systemctl disable ynh-hotspot
+sudo yunohost service remove ynh-hotspot
 sudo rm -f /etc/systemd/system/ynh-hotspot.service /usr/local/bin/ynh-hotspot
 sudo rm -f /tmp/.ynh-hotspot-*