Skip to content
Snippets Groups Projects
Commit 1732abb3 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch '6877_final_status_in_log' into 'master'

small fixes

See merge request !14
parents 9ecaad40 59948824
No related branches found
No related tags found
1 merge request!14small fixes
...@@ -23,7 +23,7 @@ replacefile=$* ...@@ -23,7 +23,7 @@ replacefile=$*
test -z "$replacefile" && replacefile="replace*.txt" test -z "$replacefile" && replacefile="replace*.txt"
tmpfile=/tmp/myreplacement.tmp tmpfile=/tmp/myreplacement.tmp
usage="`basename $0` TEMPLATE-FILE OUTFILE [optional: REPLACE-DATA-FILE]" usage="USAGE: $( basename $0 ) TEMPLATE-FILE OUTFILE [optional: REPLACE-DATA-FILE(S)]"
# cfgdiff is set in setProfile in ../deploy_app.sh while running through a profile # cfgdiff is set in setProfile in ../deploy_app.sh while running through a profile
# if create_config.sh is used standalone we hide the output # if create_config.sh is used standalone we hide the output
......
...@@ -137,6 +137,7 @@ function run_task(){ ...@@ -137,6 +137,7 @@ function run_task(){
if [ -x "${taskscript}" ]; then if [ -x "${taskscript}" ]; then
echo "INFO: starting script ${taskscript}..." echo "INFO: starting script ${taskscript}..."
. "${taskscript}" || exit 10 . "${taskscript}" || exit 10
echo "DONE: script ${taskscript}"
else else
test -f "${taskscript}" && ( echo "SKIP: task script ${taskscript} is not executable." ; ls -l "${taskscript}") test -f "${taskscript}" && ( echo "SKIP: task script ${taskscript} is not executable." ; ls -l "${taskscript}")
test -f "${taskscript}" || echo "SKIP: task script ${taskscript} does not exist." test -f "${taskscript}" || echo "SKIP: task script ${taskscript} does not exist."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment