diff --git a/utils/load_settings.sh b/utils/load_settings.sh index a001b98b4e9188ac89f8200069dad3a34e2ea354..9e8d1b7ced203a179c8ffb05d62bc10c0bcad190 100644 --- a/utils/load_settings.sh +++ b/utils/load_settings.sh @@ -18,6 +18,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. +# Load setting from different files, in this order: +# - config.defaults +# - .config +# - The file given in ENV_FILE. + [[ -n "config.defaults" ]] && source "config.defaults" [[ -n ".config" ]] && source ".config" [[ -n "$ENV_FILE" ]] && source "$ENV_FILE" diff --git a/utils/make_db b/utils/make_db index 72a49dab721d337340f37aebe7fcc3231da9e40a..f141fee8172383b3e7647801cbe1bc68040dcad4 100755 --- a/utils/make_db +++ b/utils/make_db @@ -29,11 +29,11 @@ if [ -z "$UTILSPATH" ]; then export UTILSPATH fi +set -e + source $UTILSPATH/load_settings.sh source $UTILSPATH/helpers.sh -set -e - function fail() { echo "Some error occured, exiting." exit 1