summaryrefslogtreecommitdiff
path: root/bin/bash_shared/includes.sh
diff options
context:
space:
mode:
authorShinDarth <borzifrancesco@gmail.com>2016-08-07 14:55:21 +0200
committerShinDarth <borzifrancesco@gmail.com>2016-08-07 14:55:21 +0200
commita7a81f90b191aeabebc768ff18807abf6d655a0c (patch)
tree369c1e94a8270ac4a5ea60cfa14243bb6866f043 /bin/bash_shared/includes.sh
parentb96f058c175657aa85047f4200196bdd952c9888 (diff)
parent1fcfb9af5a0a8e4d308ec2ccda20adab99dce3ec (diff)
Merge branch 'master' into git
Diffstat (limited to 'bin/bash_shared/includes.sh')
-rw-r--r--bin/bash_shared/includes.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/bin/bash_shared/includes.sh b/bin/bash_shared/includes.sh
index 3e53937a2b..966e622970 100644
--- a/bin/bash_shared/includes.sh
+++ b/bin/bash_shared/includes.sh
@@ -5,3 +5,20 @@ AZTH_PATH_SHARED="$AZTH_PATH_BIN/bash_shared"
source "$AZTH_PATH_SHARED/defines.sh"
source "$AZTH_PATH_SHARED/functions.sh"
+
+source "$AZTH_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
+
+if [ -f "$AZTH_PATH_CONF/config.sh" ]; then
+ source "$AZTH_PATH_CONF/config.sh" # should overwrite previous
+fi
+
+#
+# Load modules
+#
+
+for entry in "$AZTH_PATH_MODULES/"*/include.sh
+do
+ if [ -e $entry ]; then
+ source $entry
+ fi
+done