From fd13f65fae68964910e7c59211b0a6730085daf2 Mon Sep 17 00:00:00 2001 From: zawz Date: Thu, 22 Jun 2023 12:14:41 +0200 Subject: [PATCH] fixes --- fscp/fscp | 12 ++++++++---- zdate/zdate | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/fscp/fscp b/fscp/fscp index dcec743..df8d326 100755 --- a/fscp/fscp +++ b/fscp/fscp @@ -31,9 +31,8 @@ srcscript=' cd "$(dirname "$path")" name=$(basename "$path") size=$(du -sb "$name" | cut -f1) - sleep 0.1 printf "%s\n" "$name" - sleep 0.1 + sleep 0.5 if [ -d "$name" ] ; then echo folder cd "$name" @@ -41,8 +40,13 @@ srcscript=' else echo file fi - sleep 0.1 - exec "$@" "$name" | pv -s "$size" -fw $cw | $comp + exec "$@" "$name" | { + if which pv >/dev/null 2>&1 ; then + pv -s "$size" -fw $cw + else + cat + fi + } | $comp ' dstscript=' diff --git a/zdate/zdate b/zdate/zdate index 100f35c..18859ff 100755 --- a/zdate/zdate +++ b/zdate/zdate @@ -1,5 +1,7 @@ #!/bin/sh +[ "$DEBUG" = true ] && set -x + fname="$(basename "$0")" usage() @@ -32,9 +34,9 @@ targets="." [ $# -gt 0 ] && targets="$*" if [ -n "$opt_v" ] ; then - ret=$(find $targets -printf '%T@\n' | sort -n | head -n1 | cut -d'.' -f1) + ret=$(find "$@" -printf '%T@\n' | sort -n | head -n1 | cut -d'.' -f1) else - ret=$(find $targets -printf '%T@\n' | sort -n | tail -n1 | cut -d'.' -f1) + ret=$(find "$@" -printf '%T@\n' | sort -n | tail -n1 | cut -d'.' -f1) fi @@ -42,9 +44,9 @@ if [ -n "$opt_s" ] then true # do nothing: already in seconds elif [ -n "$date_format" ] ; then - ret=$(date --date="$date_format" 2>/dev/null) + ret=$(date --date="@$ret" "$date_format" 2>/dev/null) else # resolve to default date ret=$(date --date="@$ret" 2>/dev/null) fi -[ -n "$ret" ] && echo $ret +[ -n "$ret" ] && echo "$ret"