Merge pull request #229 from YunoHost-Apps/testing

Fix bookworm
YunoHost-Apps · Aug 5, 2023 · 1ca9dd5 · 1ca9dd5
2 parents 562dde8 + d17d9af
commit 1ca9dd5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
@@ -24,7 +24,7 @@ assets="https://github.com/Requarks/wiki/releases/download/$version/wiki-js.tar.
 # Sometimes the release name starts with a "v", so let's filter it out.
 # You may need more tweaks here if the upstream repository has different naming conventions.
 if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-    version=${version:1}
+	version=${version:1}
 fi
 
 # Setting up the environment variables
@@ -36,12 +36,12 @@ echo "PROCEED=false" >> $GITHUB_ENV
 
 # Proceed only if the retrieved version is greater than the current one
 if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-    echo "::warning ::No new version available"
-    exit 0
+	echo "::warning ::No new version available"
+	exit 0
 # Proceed only if a PR for this new version does not already exist
 elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-    echo "::warning ::A branch already exists for this update"
-    exit 0
+	echo "::warning ::A branch already exists for this update"
+	exit 0
 fi
 
 #=================================================

diff --git a/check_process b/check_process
@@ -48,10 +48,12 @@
 		upgrade=1	from_commit=de01b48bfee4abff5edcf2fd288d3ff930ccc45a
 		# 2.5.272~ynh1
 		upgrade=1	from_commit=0721e06b03c1fa384adcade256b1d67c9462d61e
+		# 2.5.299~ynh1
+		upgrade=1	from_commit=562dde836f45847aaf53caa6a4e77c24377d6b76
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
-		change_url=1
+		change_url=0
 ;;; Options
 Email=
 Notification=none
diff --git a/scripts/_common.sh b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="postgresql postgresql-contrib"
+pkg_dependencies="postgresql postgresql-contrib rsync"
 
 nodejs_version=16
 

diff --git a/scripts/change_url b/scripts/change_url
@@ -72,7 +72,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service"
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
 
 #=================================================
 # MODIFY URL IN NGINX CONF

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_script_progression --message="Loading settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -55,7 +55,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service"
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -100,6 +100,8 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================