This fixes garbled output like this:
-n
Aborted:
Sat Dec 2 20:45:02 CET 2017
ErrorMsg "--> Got signal, cleaning up & aborting ..."
echo
CleanUp
ErrorMsg "--> Got signal, cleaning up & aborting ..."
echo
CleanUp
- ErrorMsg -n "Aborted: " >&2; date
+ ErrorMsg "Aborted: $(date)" >&2
echo "Running job ${what}-exec command ..."
[ "$local" -eq 0 ] \
&& cmd="$ssh_cmd ${user}@${system} $cmd"
echo "Running job ${what}-exec command ..."
[ "$local" -eq 0 ] \
&& cmd="$ssh_cmd ${user}@${system} $cmd"
- echo -n "Start date (${what}-exec): "; date
+ echo "Start date (${what}-exec): $(date)"
echo "$cmd"
if [ "$DRYRUN" -eq 0 ]; then
$SHELL -c "$cmd"; local ret=$?
echo "$cmd"
if [ "$DRYRUN" -eq 0 ]; then
$SHELL -c "$cmd"; local ret=$?
-echo -n "Started: "; date
echo -e "$config_info"
# Check rsync and its protocol version
echo -e "$config_info"
# Check rsync and its protocol version
ErrorMsg "Lockfile \"$PIDFILE\" already exists."
ErrorMsg "Is an other instance still running?"
echo
ErrorMsg "Lockfile \"$PIDFILE\" already exists."
ErrorMsg "Is an other instance still running?"
echo
- ErrorMsg -n "Aborted: " >&2; date
+ ErrorMsg "Aborted: $(date)" >&2
fi
echo "Backing up to \"$sys_target\" ..."
fi
echo "Backing up to \"$sys_target\" ..."
- echo -n "Start date: "; date
+ echo "Start date: $(date)"
echo "$cmd"
count_started=$count_started+1
ok=0
echo "$cmd"
count_started=$count_started+1
ok=0
- echo -n "End date: "; date
+ echo "End date: $(date)"
if [[ $ret -eq 0 || $ret -eq 24 ]]; then
[ $ret -eq 24 ] && count_ok_vanished=$count_ok_vanished+1
if [[ $ret -eq 0 || $ret -eq 24 ]]; then
[ $ret -eq 24 ] && count_ok_vanished=$count_ok_vanished+1
|| ErrorMsg "Failed to delete \"$dir\" of \"$system\"!"
fi
done
|| ErrorMsg "Failed to delete \"$dir\" of \"$system\"!"
fi
done
- echo -n "Clean up finished: "; date
+ echo "Clean up finished: $(date)"
elif [ -n "$to_delete" ]; then
ErrorMsg "There have been errors for \"$system\", not cleaning up old generations!"
else
elif [ -n "$to_delete" ]; then
ErrorMsg "There have been errors for \"$system\", not cleaning up old generations!"
else
echo
[ $count_all -eq 1 ] && s="" || s="s"
[ $count_enabled -eq $count_all ] \
echo
[ $count_all -eq 1 ] && s="" || s="s"
[ $count_enabled -eq $count_all ] \