Browse Source

changed order of `source …`

yunohost helpers get included first so that I can overwrite them
from _common.sh
Chris Vogel 1 năm trước cách đây
mục cha
commit
59d2579bdf
4 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 1
      scripts/install
  2. 1 1
      scripts/remove
  3. 1 1
      scripts/restore
  4. 1 1
      scripts/upgrade

+ 1 - 1
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

+ 1 - 1
scripts/remove

@@ -6,8 +6,8 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
 source /usr/share/yunohost/helpers
+source _common.sh
 
 #=================================================
 # STANDARD REMOVE

+ 1 - 1
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

+ 1 - 1
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