Use systemctl helper to avoid deadlocks with ynh 2.7 and check path avaibility with no deprecated method

scripts/helpers

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+source /usr/share/yunohost/helpers
+
+#
+# Helper to start/stop/.. a systemd service from a yunohost context,
+# *and* the systemd service itself needs to be able to run yunohost
+# commands.
+# 
+# Hence the need to release the lock during the operation
+#
+# usage : ynh_systemctl yolo restart
+#
+function ynh_systemctl()
+{
+  local ACTION="$1"
+  local SERVICE="$2"
+  local LOCKFILE="/var/run/moulinette_yunohost.lock"
+
+  # Launch the action
+  sudo systemctl "$ACTION" "$SERVICE" &
+  local SYSCTLACTION=$!
+
+  # Save and release the lock...
+  cp $LOCKFILE $LOCKFILE.bkp.$$
+  rm $LOCKFILE
+  
+  # Wait for the end of the action
+  wait $SYSCTLACTION
+
+  # Make sure the lock is released...
+  while [ -f $LOCKFILE ]
+  do
+    sleep 0.1
+  done
+
+  # Restore the old lock
+  mv $LOCKFILE.bkp.$$ $LOCKFILE
+}

scripts/install

@@ -20,6 +20,10 @@
 # This is an upgrade?
 upgrade=$([ "${PIRATEBOX_UPGRADE}" == 1 ] && echo true || echo false)
 
+if ! $upgrade; then
+  source ./helpers
+fi
+
 # Retrieve arguments
 domain=${1}
 url_path=${2}
@@ -48,10 +52,7 @@ else
 fi
 
 # Check domain/path availability
-sudo yunohost app checkurl ${domain}${url_path} -a piratebox
-if [ ! $? -eq 0 ]; then
-  exit 1
-fi
+ynh_webpath_register piratebox $domain $url_path || exit 1
 
 if ! $upgrade; then
 
@@ -167,7 +168,7 @@ sudo systemctl enable ynh-piratebox
 sudo yunohost service add ynh-piratebox
 
 if ! $upgrade; then
-  sudo systemctl start ynh-piratebox
+  ynh_systemctl start ynh-piratebox
 
   echo "WARNING: PirateBox is not started because you need to define an associated wifi hotspot through the web admin" >&2
 fi

scripts/remove

@@ -17,11 +17,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source ./helpers
+
 # Retrieve arguments
 domain=$(sudo yunohost app setting piratebox domain)
 
 # The End
-sudo systemctl stop ynh-piratebox
+ynh_systemctl stop ynh-piratebox
 sudo systemctl disable ynh-piratebox
 sudo yunohost service remove ynh-piratebox
 sudo rm -f /etc/systemd/system/ynh-piratebox.service /usr/local/bin/ynh-piratebox

scripts/upgrade

@@ -7,6 +7,8 @@ ynh_setting() {
   sudo grep "^${setting}:" "/etc/yunohost/apps/${app}/settings.yml" | sed s/^[^:]\\+:\\s*[\"\']\\?// | sed s/\\s*[\"\']\$//
 }
 
+source ./helpers
+
 domain=$(ynh_setting piratebox domain)
 path=$(ynh_setting piratebox path)
 opt_domain=$(ynh_setting piratebox opt_domain)
@@ -37,6 +39,6 @@ if [ -z "$(ynh_setting piratebox opt_maxspace)" ]; then
   sudo yunohost app setting piratebox opt_maxspace -v 90
 fi
 
-sudo systemctl start ynh-piratebox
+ynh_systemctl start ynh-piratebox
 
 exit 0