go-opsi/opsi.opsi-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove DRYS

Browse Source
This commit is contained in:
DT Netsolution GmbH 2012-01-28 10:27:46 +01:00
parent 8b262b2b46
commit 40906de552
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/builder-targets.sh
View File

@ -14,15 +14,16 @@ builder_config() {
builder_check_error "temp directory not available: $TMP_DIR" builder_check_error "temp directory not available: $TMP_DIR"
# Source product release configuration # Source product release configuration
test -f ${PRODUCT_DIR}/builder-product.cfg local config=${PRODUCT_DIR}/builder-product.cfg
builder_check_error "can't read release configuration: ${PRODUCT_DIR}/product.cfg" test -f ${config} || builder_check_error "can't read product config: ${config}"
. $PRODUCT_DIR/builder-product.cfg . ${config}
# set default build configuration and source the user dependent file # set default build configuration and source the user dependent file
. $BASEDIR/conf/opsi-builder.cfg . $BASEDIR/conf/opsi-builder.cfg
# Source local build configuration (must be done AFTER sourcing the release.cfg) # Source local build configuration (must be done AFTER sourcing the release.cfg)
test -f $HOME/.opsi-builder.cfg && . $HOME/.opsi-builder.cfg && echo "Loaded builder configuration: $HOME/.opsi-builder.cfg" config=$HOME/.opsi-builder.cfg
test -f ${config} && . ${config} && echo "Loaded builder configuration: ${config}"
test -f "$OPSI_BUILDER" && . $OPSI_BUILDER && echo "Loaded builder configuration: $OPSI_BUILDER" test -f "$OPSI_BUILDER" && . $OPSI_BUILDER && echo "Loaded builder configuration: $OPSI_BUILDER"
# Check variables # Check variables