From 59d2579bdf52bcda736baff677311760c4e5943f Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Sun, 26 May 2024 19:47:35 +0200 Subject: [PATCH] =?UTF-8?q?changed=20order=20of=20`source=20=E2=80=A6`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit yunohost helpers get included first so that I can overwrite them from _common.sh --- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 5845dc1..878252d 100755 --- a/scripts/install +++ b/scripts/install @@ -1,8 +1,8 @@ #!/bin/bash # IMPORT GENERIC HELPERS -source _common.sh source /usr/share/yunohost/helpers +source _common.sh # https://codeberg.org/ChriChri/flohmarkt_ynh/issues/9 # check if couchdb is already installed diff --git a/scripts/remove b/scripts/remove index 9054234..1a8d7c2 100755 --- a/scripts/remove +++ b/scripts/remove @@ -6,8 +6,8 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh source /usr/share/yunohost/helpers +source _common.sh #================================================= # STANDARD REMOVE diff --git a/scripts/restore b/scripts/restore index f1c5c5c..d337f34 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,7 +1,7 @@ #!/bin/bash -source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +source ../settings/scripts/_common.sh # reinstall couchdb ynh_script_progression --message="Reinstalling couchdb..." --weight=40 diff --git a/scripts/upgrade b/scripts/upgrade index 76e394f..8b9c0bc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,7 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers +source _common.sh # UPGRADE_PACKAGE if only the YunoHost package has changed # UPGRADE_APP if the upstream app version has changed