Fix

scripts/_common.sh

@@ -106,3 +106,67 @@ set_access_settings() {
         ynh_app_setting_set $app skipped_regex "$excaped_domain$excaped_path/[%w-.]*/[%w-.]*/git%-receive%-pack,$excaped_domain$excaped_path/[%w-.]*/[%w-.]*/git%-upload%-pack,$excaped_domain$excaped_path/[%w-.]*/[%w-.]*/info/refs"
     fi
 }
+
+#=================================================
+
+# Delete a file checksum from the app settings
+#
+# $app should be defined when calling this helper
+#
+# usage: ynh_remove_file_checksum file
+# | arg: file - The file for which the checksum will be deleted
+ynh_delete_file_checksum () {
+    local checksum_setting_name=checksum_${1//[\/ ]/_}  # Replace all '/' and ' ' by '_'
+    ynh_app_setting_delete $app $checksum_setting_name
+} 
+
+# Start or restart a service and follow its booting
+#
+# usage: ynh_check_starting "Line to match" [Log file] [Timeout] [Service name]
+#
+# | arg: Line to match - The line to find in the log to attest the service have finished to boot.
+# | arg: Log file - The log file to watch
+# | arg: Service name
+# /var/log/$app/$app.log will be used if no other log is defined.
+# | arg: Timeout - The maximum time to wait before ending the watching. Defaut 300 seconds.
+ynh_check_starting () {
+    local line_to_match="$1"
+    local service_name="${4:-$app}"
+    local app_log="${2:-/var/log/$service_name/$service_name.log}"
+    local timeout=${3:-300}
+
+    ynh_clean_check_starting () {
+        # Stop the execution of tail.
+        kill -s 15 $pid_tail 2>&1
+        ynh_secure_remove "$templog" 2>&1
+    }
+
+    echo "Starting of $service_name" >&2
+    systemctl stop $service_name
+    local templog="$(mktemp)"
+    # Following the starting of the app in its log
+    tail -F -n0 "$app_log" > "$templog" &
+    # Get the PID of the tail command
+    local pid_tail=$!
+    systemctl start $service_name
+
+    local i=0
+    for i in `seq 1 $timeout`
+    do
+        # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
+        if grep --quiet "$line_to_match" "$templog"
+        then
+            echo "The service $service_name has correctly started." >&2
+            break
+        fi
+        echo -n "." >&2
+        sleep 1
+    done
+    if [ $i -eq $timeout ]
+    then
+        echo "The service $service_name didn't fully started before the timeout." >&2
+    fi
+
+    echo ""
+    ynh_clean_check_starting
+}

scripts/backup

@@ -11,7 +11,6 @@ source /usr/share/yunohost/helpers
 ynh_abort_if_errors
 
 # Load common variables and helpers
-source ../settings/scripts/experimental_helper.sh
 source ../settings/scripts/_common.sh
 
 # Retrieve app settings

scripts/change_url

@@ -11,7 +11,6 @@ source /usr/share/yunohost/helpers
 ynh_abort_if_errors
 
 # Import common cmd
-source ./experimental_helper.sh
 source ./_common.sh
 
 # RETRIEVE ARGUMENTS

scripts/experimental_helper.sh

@@ -1,61 +0,0 @@
-# Delete a file checksum from the app settings
-#
-# $app should be defined when calling this helper
-#
-# usage: ynh_remove_file_checksum file
-# | arg: file - The file for which the checksum will be deleted
-ynh_delete_file_checksum () {
-	local checksum_setting_name=checksum_${1//[\/ ]/_}	# Replace all '/' and ' ' by '_'
-	ynh_app_setting_delete $app $checksum_setting_name
-} 
-
-# Start or restart a service and follow its booting
-#
-# usage: ynh_check_starting "Line to match" [Log file] [Timeout] [Service name]
-#
-# | arg: Line to match - The line to find in the log to attest the service have finished to boot.
-# | arg: Log file - The log file to watch
-# | arg: Service name
-# /var/log/$app/$app.log will be used if no other log is defined.
-# | arg: Timeout - The maximum time to wait before ending the watching. Defaut 300 seconds.
-ynh_check_starting () {
-	local line_to_match="$1"
-	local service_name="${4:-$app}"
-	local app_log="${2:-/var/log/$service_name/$service_name.log}"
-	local timeout=${3:-300}
-
-	ynh_clean_check_starting () {
-		# Stop the execution of tail.
-		kill -s 15 $pid_tail 2>&1
-		ynh_secure_remove "$templog" 2>&1
-	}
-
-	echo "Starting of $service_name" >&2
-	systemctl stop $service_name
-	local templog="$(mktemp)"
-	# Following the starting of the app in its log
-	tail -F -n0 "$app_log" > "$templog" &
-	# Get the PID of the tail command
-	local pid_tail=$!
-	systemctl start $service_name
-
-	local i=0
-	for i in `seq 1 $timeout`
-	do
-		# Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
-		if grep --quiet "$line_to_match" "$templog"
-		then
-			echo "The service $service_name has correctly started." >&2
-			break
-		fi
-		echo -n "." >&2
-		sleep 1
-	done
-	if [ $i -eq $timeout ]
-	then
-		echo "The service $service_name didn't fully started before the timeout." >&2
-	fi
-
-	echo ""
-	ynh_clean_check_starting
-}

scripts/install

@@ -11,17 +11,15 @@ source /usr/share/yunohost/helpers
 ynh_abort_if_errors
 
 # Load common variables and helpers
-source ./experimental_helper.sh
 source ./_common.sh
 
 # Retrieve arguments
 domain=$YNH_APP_ARG_DOMAIN
-path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH)
+path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 
 # Check domain/path availability
-ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
 ynh_webpath_register $app $domain $path_url
 
 # Check user parameter

scripts/remove

@@ -8,7 +8,6 @@
 source /usr/share/yunohost/helpers
 
 # Load common variables and helpers
-source ./experimental_helper.sh
 source ./_common.sh
 
 #=================================================

scripts/restore

@@ -11,7 +11,6 @@ source /usr/share/yunohost/helpers
 ynh_abort_if_errors
 
 # Load common variables and helpers
-source ../settings/scripts/experimental_helper.sh
 source ../settings/scripts/_common.sh
 
 # Retrieve old app settings
@@ -20,12 +19,8 @@ path_url=$(ynh_app_setting_get "$app" path)
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 admin=$(ynh_app_setting_get "$app" adminusername)
 
-# Check domain/path availability with app helper
-ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
-
 # Check user parameter
-ynh_user_exists "$admin" \
+ynh_user_exists "$admin" || ynh_die "The chosen admin user does not exist."
-  || ynh_die "The chosen admin user does not exist."
 
 # Check Final Path availability
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
@@ -49,7 +44,7 @@ ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./db.sql
 
 # Restore systemd files
 systemctl daemon-reload
-systemctl enable "$app".service
+systemctl enable "$app".service --quiet
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -11,12 +11,11 @@ source /usr/share/yunohost/helpers
 ynh_abort_if_errors
 
 # Load common variables and helpers
-source ./experimental_helper.sh
 source ./_common.sh
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
-path_url=$(ynh_normalize_url_path $(ynh_app_setting_get "$app" path))
+path_url=$(ynh_app_setting_get "$app" path)
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 admin=$(ynh_app_setting_get "$app" adminusername)
 key=$(ynh_app_setting_get "$app" secret_key)