From 3405f45501dcdbd3a22b09f183ed395c025aa917 Mon Sep 17 00:00:00 2001 From: ville rantanen Date: Sun, 20 May 2018 13:33:31 +0300 Subject: [PATCH] fix ncd, mvregex should get a total facelift --- files/mvregex | 5 ++++- qcd_function | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/files/mvregex b/files/mvregex index 514e0d0..5b1a9c3 100755 --- a/files/mvregex +++ b/files/mvregex @@ -109,7 +109,10 @@ if [ "$MODE" = "printf" ]; then # remove zeroes from beginning, if matching integers let source_match="10#$source_match" &> /dev/null target_replace=$( printf "$TGT" "$source_match" ) - mv -iv -- "$file" "$( echo $file | sed s/"$SRC"/"${target_replace}"/ )" + target_file="$( echo $file | sed s/"$SRC"/"${target_replace}"/ )" + if [[ ! "$file" = "$target_file" ]]; then + mv -iv -- "$file" "$( echo $file | sed s/"$SRC"/"${target_replace}"/ )" + fi done exit fi diff --git a/qcd_function b/qcd_function index ad3d1a9..0d9b37b 100644 --- a/qcd_function +++ b/qcd_function @@ -191,7 +191,7 @@ function ncd() { return } local _current_pwd _iter_d _iter_prev _current_found - _current_pwd=$( basename $( pwd ) ) + _current_pwd=$( basename "$( pwd )" ) \cd .. for _iter_d in *; do if [ ! -d "$_iter_d" ]; then continue; fi