From 30c94601665181e3970ba0670853d8ad24866565 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Sun, 15 Apr 2018 07:19:10 +0200 Subject: [PATCH] Fix expansion problems --- timesheet/report.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/timesheet/report.sh b/timesheet/report.sh index 2dc8381..d03f156 100755 --- a/timesheet/report.sh +++ b/timesheet/report.sh @@ -21,7 +21,7 @@ function datetimedescription() { do extracttime $T printf "%s;%s;%s;%s;%s\n" \ - $TIMEKEY $TIME $PROJECT $DESCRIPTION $COMPLETED + "$TIMEKEY" "$TIME" "$PROJECT" "$DESCRIPTION" "$COMPLETED" done done } @@ -32,7 +32,7 @@ function report() { DATE=$1 for LINE in "${(f)$(datetimedescription $@|sort -t\; -f -k1,1 -k3,3)}" do - set -- ${(s(;))LINE} + set -- "${(@s(;))LINE}" if [[ -n $1 && $(date -d $1 +%s) -ge $(date -d $DATE +%s) ]] then if [[ $D != $1 ]] @@ -42,7 +42,7 @@ function report() { fi T=$2 if [[ -n $5 ]] && T=$(bold "" $T) - if [[ -n $D ]] && printf "%s [%s] - %s\n" $T $3 $4 + if [[ -n $D ]] && printf "%s [%s] - %s\n" "$T" "$3" "$4" fi done } @@ -104,6 +104,5 @@ done DATEFROM=${DATEFROM:-$(date +%Y-%m-01)} report $DATEFROM $@ -#datetimedescription $DATEFROM $@|sort -t\; -f -k1,1 -k3,3 # vim: set et ts=4 sw=4: