Fix upgrade/restore script

scripts/install

@@ -25,14 +25,14 @@ upgrade=$([ "${TORCLIENT_UPGRADE}" == 1 ] && echo true || echo false)
 domain=${1}
 url_path=${2}
 
+# Check domain/path availability
+sudo yunohost app checkurl ${domain}${url_path} -a torclient
+if [ ! $? -eq 0 ]; then
+  exit 1
+fi
+  
 if ! $upgrade; then
 
-  # Check domain/path availability
-  sudo yunohost app checkurl ${domain}${url_path} -a torclient
-  if [ ! $? -eq 0 ]; then
-    exit 1
-  fi
-  
   if [ ! -e /tmp/.ynh-hotspot-started ]; then
     echo "WARNING: Hotspot app not installed or not started" >&2
   fi
@@ -55,10 +55,6 @@ if ! $upgrade; then
 
 fi
 
-# Save git commit
-gitcommit=$(git rev-parse HEAD)
-sudo yunohost app setting torclient gitcommit -v "${gitcommit}"
-
 sudo install -o root -g root -m 0644 ../conf/torrc /etc/tor/torrc.tpl
 sudo install -b -o root -g root -m 0644 ../conf/nginx_torclient.conf "/etc/nginx/conf.d/${domain}.d/torclient.conf"
 sudo install -b -o root -g root -m 0644 ../conf/phpfpm_torclient.conf /etc/php5/fpm/pool.d/torclient.conf

scripts/restore

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-gitcommit=$(sudo yunohost app setting torclient gitcommit)
+gitcommit=$(sudo grep revision /etc/yunohost/apps/torclient/status.json | sed 's/.*"revision": "\([^"]\+\)".*/\1/')
 tmpdir=$(mktemp -dp /tmp/ torclient-restore-XXXXX)
 
 git clone https://github.com/labriqueinternet/torclient_ynh.git "${tmpdir}/"

scripts/upgrade

@@ -17,13 +17,9 @@ export TORCLIENT_UPGRADE=1
 sudo bash /etc/yunohost/apps/torclient/scripts/remove &> /dev/null
 bash ./install "${domain}" "${path}"
 
-gitcommit=$(ynh_setting torclient gitcommit)
-
 sudo cp -a "${tmpdir}/settings.yml" /etc/yunohost/apps/torclient/
 sudo rm -r "${tmpdir}/"
 
-sudo yunohost app setting torclient gitcommit -v "${gitcommit}"
-
 sudo systemctl start ynh-torclient
 
 exit 0