Compare commits
2 Commits
8b5cda7f73
...
2045dcedf5
Author | SHA1 | Date | |
---|---|---|---|
2045dcedf5 | |||
9d6bb99963 |
@ -37,17 +37,13 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
|
||||
read_config() {
|
||||
local func="${FUNCNAME[0]}"
|
||||
|
||||
WORKING_DIRECTORY=${WORKING_DIRECTORY:-$UPDATEPSAHOME}
|
||||
WORKING_DIRECTORY=${PWD}
|
||||
CONFIGFILENAME=${CONFIGFILENAME:-'update_psa.conf'}
|
||||
|
||||
if ! [ -f "$CONFIGFILENAME" ]; then
|
||||
log_fatal "$func:${LINENO}: $CONFIGFILENAME not found"
|
||||
fi
|
||||
|
||||
if ! [ -d "$WORKING_DIRECTORY" ]; then
|
||||
log_fatal "$func:${LINENO}: $WORKING_DIRECTORY not found"
|
||||
fi
|
||||
|
||||
log_debug "$func:${LINENO}: CONFIGFILENAME=$CONFIGFILENAME"
|
||||
log_debug "$func:${LINENO}: WORKING_DIRECTORY=$WORKING_DIRECTORY"
|
||||
|
||||
|
19
update_psa
19
update_psa
@ -14,10 +14,10 @@
|
||||
# ./update_psa --file $PWD/update_psa.conf --wdir $PWD
|
||||
#
|
||||
###############################################################################
|
||||
if [ $# -eq 0 ]; then
|
||||
# if [ $# -eq 0 ]; then
|
||||
# no parameters given -> nothing to do
|
||||
exit 0
|
||||
fi
|
||||
# exit 0
|
||||
#fi
|
||||
|
||||
if [ -z $IFS ]; then
|
||||
IFS=$'\n'
|
||||
@ -59,11 +59,12 @@ while test $# -gt 0; do
|
||||
shift
|
||||
done
|
||||
|
||||
source ./update_psa_impl
|
||||
if cd "$WORKING_DIRECTORY"; then
|
||||
source ./update_psa_impl
|
||||
|
||||
if read_config
|
||||
then
|
||||
if clone_customer_repository $CUSTOMER_REPOSITORY_PATH
|
||||
if read_config
|
||||
then
|
||||
if clone_customer_repository ${CUSTOMER_REPOSITORY_PATH}
|
||||
then
|
||||
check_sanity_of_repository
|
||||
|
||||
@ -76,7 +77,9 @@ then
|
||||
|
||||
update_psa
|
||||
fi
|
||||
fi
|
||||
exit $EXIT_CODE
|
||||
fi
|
||||
|
||||
exit $EXIT_CODE
|
||||
exit -1
|
||||
###############################################################################
|
||||
|
Loading…
x
Reference in New Issue
Block a user