From e7a8d9b69d459aaaa83204689a0e34862391035d Mon Sep 17 00:00:00 2001 From: VG Date: Mon, 25 Jan 2016 20:50:11 +0100 Subject: reduce filename handling cornercases be more robust if TMPDIR contains some unusual characters --- bulkrename | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bulkrename b/bulkrename index b030fa4..a927f9b 100755 --- a/bulkrename +++ b/bulkrename @@ -20,9 +20,8 @@ exec /dev/tty || { echo 'Interactive terminal needed' >&2 ; exit 1; } sed -i -- '1d' "${namebase}.2" if [ $(wc -l < "${namebase}.1") -ne $(wc -l < "${namebase}.2") ] ; then - rm -r "$(dirname "${namebase}")" - echo "Wrong number of lines" >&2 - exit 1 + rm -r -- "$(dirname -- "${namebase}")" + echo "Wrong number of lines" >&2 ; exit 1 fi sed -i -- 's/\([\\"$`]\)/\\\1/g;' "${namebase}.1" "${namebase}.2" @@ -35,10 +34,9 @@ sed -i -- 's/\([\\"$`]\)/\\\1/g;' "${namebase}.1" "${namebase}.2" > "${namebase}.sh" if [ "$(wc -c < "${namebase}.sh")" -ne 0 ] ; then - - "$EDITOR" "${namebase}.sh" + "$EDITOR" -- "${namebase}.sh" sh -e -- "${namebase}.sh" echo "bulkrename is done" fi -rm -r "$(dirname "${namebase}")" +rm -r -- "$(dirname "${namebase}")" -- cgit v1.2.3