fix

.github/workflows/updater.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-i=1
-version=$(curl --silent "https://api.github.com/repos/$repo/tags?page=$i" | jq -r '.[] | select( .name | contains("rc") or contains("beta") or contains("alpha") or startswith("6") or startswith("7") | not ) | .name' | sort -V | tail -1)
-while [ -z $version ] ; do
-    sleep 10
-    i=$(($i + 1))
-    version=$(curl --silent "https://api.github.com/repos/$repo/tags?page=$i" | jq -r '.[] | select( .name | contains("rc") or contains("beta") or contains("alpha") or startswith("6") or startswith("7") | not ) | .name' | sort -V | tail -1)
-done
-
-# Later down the script, we assume the version has only digits and dots
-# 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}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-echo "REPO=$repo" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-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
-# 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
-fi
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0

.github/workflows/updater.yml

@@ -1,49 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-          draft: false

conf/Template_Yunohost.xml

@@ -10,7 +10,7 @@
     <templates>
         <template>
             <template>Template Yunohost</template>
-            <name>Template Yunohost</name>
+            <name>Template YunoHost</name>
             <description>Please check default value template macro.&#13;
 &#13;
 cat /etc/sudoers.d/zabbix &#13;

scripts/_common.sh

@@ -152,12 +152,12 @@ import_template () {
 
 		if [ "$importState" -eq "1" ]
 		then
-			ynh_print_info --message="YunoHost template imported !"
+			ynh_print_info --message="YunoHost template imported!"
 		else
-			ynh_print_warn --message="YunoHost template not imported !"
+			ynh_print_warn --message="YunoHost template not imported!"
 		fi
 	else
-		ynh_print_warn --message="Admin user cannot connect to the interface !"
+		ynh_print_warn --message="Admin user cannot connect to the interface!"
 	fi
 }
 
@@ -172,9 +172,9 @@ link_template () {
 	applyTemplate=$(curl --noproxy $domain -k -s --resolve $domain:443:127.0.0.1 --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","method":"host.massadd","params":{"hosts":[{"hostid":"'"$zabbixHostID"'"}],"templates":[{"templateid":"'"$zabbixTemplateID"'"}]},"auth":"'"$tokenapi"'","id":1}' "${zabbixFullpath}/api_jsonrpc.php" | jq -r '.result.hostids[]')
 	if [ "$applyTemplate" -eq "$zabbixHostID" ]
 	then
-		ynh_print_info --message="YunoHost template linked to Zabbix server !"
+		ynh_print_info --message="YunoHost template linked to Zabbix server!"
 	else
-		ynh_print_warn --message="YunoHost template not linked to Zabbix server !"
+		ynh_print_warn --message="YunoHost template not linked to Zabbix server!"
 	fi
 }
 
@@ -184,7 +184,7 @@ check_proc_zabbixserver () {
 	pgrep zabbix_server >/dev/null
 	if [ $? -eq 0 ]
 	then
-		ynh_print_info --message="Zabbix server is started !"
+		ynh_print_info --message="Zabbix server is started!"
 	else
 		ynh_print_err --message="Zabbix server not started, try to start it with the YunoHost interface."
 		ynh_print_err --message="If Zabbix server can't start, please open a issue on https://github.com/YunoHost-Apps/zabbix_ynh/issues"
@@ -210,13 +210,13 @@ remove_previous_zabbix () {
 	#ynh_print_info --message="Previous Zabbix installation will be purged !"
 	apt-get purge zabbix* -y
 	#ynh_secure_remove --file="/var/cache/apt/archives/zabbix-server-mysql*"
-	ynh_print_info --message="Previous Zabbix installation purged !"
+	ynh_print_info --message="Previous Zabbix installation purged!"
 }
 
 # Update Zabbix configuration initialisation
 #
 update_initZabbixConf () {
-	ynh_print_info --message="Update Zabbix configuration initialisation !"
+	ynh_print_info --message="Update Zabbix configuration initialisation!"
 	if [ ! -d /etc/zabbix/web ]
 	then
 		mkdir -p /etc/zabbix/web
@@ -224,13 +224,13 @@ update_initZabbixConf () {
 	cp "../conf/etc_zabbix_web_init.zabbix.conf.php.sh" /etc/zabbix/web/init.zabbix.conf.php.sh
 	chmod 700 /etc/zabbix/web/init.zabbix.conf.php.sh
 	cp "../conf/etc_apt_apt.conf.d_100update_force_init_zabbix_frontend_config" /etc/apt/apt.conf.d/100update_force_init_zabbix_frontend_config
-	ynh_print_info --message="Zabbix configuration initialisation updated !"
+	ynh_print_info --message="Zabbix configuration initialisation updated!"
 }
 
 # Delete Zabbix configuration initialisation
 #
 delete_initZabbixConf () {
-	ynh_print_info --message="Delete Zabbix configuration initialisation !"
+	ynh_print_info --message="Delete Zabbix configuration initialisation!"
 	if [ -f /etc/zabbix/web/init.zabbix.conf.php.sh ]
 	then
 		ynh_secure_remove --file="/etc/zabbix/web/init.zabbix.conf.php.sh"
@@ -258,13 +258,13 @@ change_timeoutAgent () {
 # Update Zabbix database character set
 #
 convert_ZabbixDB () {
-	ynh_print_info --message="Zabbix database character set will be updated !"
+	ynh_print_info --message="Zabbix database character set will be updated!"
 	$mysqlconn -e "ALTER DATABASE $db_name CHARACTER SET utf8 COLLATE utf8_general_ci;"
 	for t in $($mysqlconn -BN -e "show tables";)
 	do
 		$mysqlconn -e "ALTER TABLE $t CONVERT TO character set utf8 collate utf8_bin;"
 	done
-	ynh_print_info --message="Zabbix database character set has been updated !"
+	ynh_print_info --message="Zabbix database character set has been updated!"
 }
 
 # Add email media type with the YunoHost server mail.