From 1e1000f1930220f5fa09bbdded81904a6a70981c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 15 Oct 2006 16:48:51 +0200 Subject: [PATCH] Fix some broken English. Again, add pwd -P instead of pwd. --- ccollect.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ccollect.sh b/ccollect.sh index ed4696c..22a46bd 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -77,7 +77,7 @@ fi # if [ ! -d "$CCOLLECT_CONF" ]; then echo "No configuration found in \"$CCOLLECT_CONF\"" \ - " (set \$CCOLLECT_CONF corectly?)" + " (is \$CCOLLECT_CONF properly set?)" exit 1 fi @@ -122,7 +122,7 @@ while [ $i -le $# ]; do done # -# be really really really verbose +# be really, really, really verbose # if [ "$VERBOSE" = 1 ]; then set -x @@ -137,7 +137,7 @@ if [ -x "$CPREEXEC" ]; then echo "Finished ${CPREEXEC}." if [ $? -ne 0 ]; then - echo "$CPREEXEC failed, aborting backup." + echo "$CPREEXEC failed, not starting backup." exit 1 fi fi @@ -152,7 +152,7 @@ if [ "$ALL" = 1 ]; then # # get entries from sources # - cwd=$(pwd) + cwd=$(pwd -P) cd "$CSOURCES"; ls > "$TMP" @@ -378,7 +378,10 @@ while [ "$i" -lt "$no_sources" ]; do # # make an absolute path, perhaps $CCOLLECT_CONF is relative! # - abs_destination_dir="$(cd $destination_dir; pwd -P)" + abs_destination_dir="$(cd $destination_dir && pwd -P)" + + if [ ! "abs_destination_dir" ]; then + echo "Could echo "Creating $abs_destination_dir ..." mkdir $VVERBOSE "$abs_destination_dir"