Compare commits

..

No commits in common. "2045dcedf5ec614719719e9f86e69567b0b8b2f3" and "8b5cda7f735449b62742a17d70f67b276e37efaa" have entirely different histories.

2 changed files with 22 additions and 21 deletions

View File

@ -37,13 +37,17 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
read_config() { read_config() {
local func="${FUNCNAME[0]}" local func="${FUNCNAME[0]}"
WORKING_DIRECTORY=${PWD} WORKING_DIRECTORY=${WORKING_DIRECTORY:-$UPDATEPSAHOME}
CONFIGFILENAME=${CONFIGFILENAME:-'update_psa.conf'} CONFIGFILENAME=${CONFIGFILENAME:-'update_psa.conf'}
if ! [ -f "$CONFIGFILENAME" ]; then if ! [ -f "$CONFIGFILENAME" ]; then
log_fatal "$func:${LINENO}: $CONFIGFILENAME not found" log_fatal "$func:${LINENO}: $CONFIGFILENAME not found"
fi 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}: CONFIGFILENAME=$CONFIGFILENAME"
log_debug "$func:${LINENO}: WORKING_DIRECTORY=$WORKING_DIRECTORY" log_debug "$func:${LINENO}: WORKING_DIRECTORY=$WORKING_DIRECTORY"

View File

@ -14,10 +14,10 @@
# ./update_psa --file $PWD/update_psa.conf --wdir $PWD # ./update_psa --file $PWD/update_psa.conf --wdir $PWD
# #
############################################################################### ###############################################################################
# if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
# no parameters given -> nothing to do # no parameters given -> nothing to do
# exit 0 exit 0
#fi fi
if [ -z $IFS ]; then if [ -z $IFS ]; then
IFS=$'\n' IFS=$'\n'
@ -59,12 +59,11 @@ while test $# -gt 0; do
shift shift
done done
if cd "$WORKING_DIRECTORY"; then source ./update_psa_impl
source ./update_psa_impl
if read_config if read_config
then then
if clone_customer_repository ${CUSTOMER_REPOSITORY_PATH} if clone_customer_repository $CUSTOMER_REPOSITORY_PATH
then then
check_sanity_of_repository check_sanity_of_repository
@ -77,9 +76,7 @@ if cd "$WORKING_DIRECTORY"; then
update_psa update_psa
fi fi
fi
exit $EXIT_CODE
fi fi
exit -1 exit $EXIT_CODE
############################################################################### ###############################################################################