From 5f572c75d0a64fb1d7f504fba44e9bb69ea88c88 Mon Sep 17 00:00:00 2001 From: George Makrydakis Date: Sun, 8 Sep 2013 16:50:09 +0300 Subject: [PATCH] Making things more homogeneous in checks, some space removed. --- lrztar | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lrztar b/lrztar index 13ea417..d2861ad 100755 --- a/lrztar +++ b/lrztar @@ -78,7 +78,7 @@ Notice: i="${i%.tar.*}" if ((v_O)); then for x in ${!p[@]};do - [ "${p[x]}"x == "-O"x ] && { + [[ ${p[x]} == "-O" ]] && { p[x]= p[$((x+1))]= break; @@ -86,16 +86,14 @@ Notice: done i="${vopt[v_O]%/}" x="${s##*/}" - if [[ $(shopt -s nullglob; - shopt -s dotglob; - echo "$i"/"${x%.tar.*}"/*) ]] && ! ((v_f)); then - printf "lrztar: %s exists, not empty, use -f.\n" \ - "$i"/"${x%.tar.*}" + if [[ -d "$i/${x%.tar.*}" ]] && ! ((v_f)); then + printf "lrztar: %s exists, use -f.\n" \ + "$i/${x%.tar.*}" return 1 fi if ! [[ -d $i ]]; then printf "lrztar: %s output path does not exist.\n" \ - "$i" + "$i" return 1 fi else