From 4972d15ecd21a6f8dfe6f8451d19ac678fa2865b Mon Sep 17 00:00:00 2001 From: Roberto Hueso Gómez Date: Mon, 19 Oct 2020 13:38:11 +0200 Subject: #988 Read json config file in scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch implements the function source_json_config() that is used to read the new ogserver.json config file in the scripts. This replaces the old 'source .../ogserver.cfg'. Co-authored-by: Javier Sánchez Parra --- repoman/bin/importimage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'repoman/bin') diff --git a/repoman/bin/importimage b/repoman/bin/importimage index db652f9d..9ced5b78 100755 --- a/repoman/bin/importimage +++ b/repoman/bin/importimage @@ -20,16 +20,16 @@ OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"} REPODIR="$OPENGNSYS/images" REPOCONF="$OPENGNSYS/etc/ogAdmRepo.cfg" -SERVERCONF="$OPENGNSYS/etc/ogserver.cfg" +SERVERCONF="$OPENGNSYS/etc/ogserver.json" DEFAULTFILE="/etc/default/opengnsys" let BACKUP=0 source $DEFAULTFILE source $REPOCONF &>/dev/null -[ "$RUN_OGADMSERVER" == "yes" ] && source $SERVERCONF &>/dev/null # Functions. source $OPENGNSYS/lib/ogfunctions.sh || exit 1 +[ "$RUN_OGADMSERVER" == "yes" ] && source_json_config $SERVERCONF &>/dev/null # Main program. -- cgit v1.2.3-18-g5258