fix edge case missing extglob

[lnf] / lnf-function

diff --git a/lnf-function b/lnf-function
index 7bc88f0c5847ccab79a067b7c3b1ad7313eb6b7b..daae096c035f51d63500a5f526d79403e260a6ee 100644 (file)
--- a/lnf-function
+++ b/lnf-function
@@ -3,30 +3,49 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 
 lnf() {
-    local help="lnf [--help] LN_ARGUMENTS...
+    local help="lnf [--help] [-T] LN_ARGUMENT...
 Create symlinks conveniently and forcefully.
+
 Remove existing file/links using trash-put or rm -rf if it is not available.
 Create directory if needed. Small change to ln argument semantics: for 2 arguments,
-the second is the link, never a directory to put the link in.
-LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supported."
-    if [[ $1 == --help ]]; then
+the second argument is a directory unless -T is passed. This removes ambiguity of
+replacing a file but not a directory. No ln option arguments are supported."
+    
+    if [[ $1 == --help || $# -eq 0 ]]; then
         echo "$help"
         return 0
     fi
+
+    local nodir=false
+    if [[ $1 == -T ]]; then
+        nodir=true
+        shift
+    fi
+    
+    local reset_extglob=false
+    ! shopt extglob >/dev/null && reset_extglob=true
+    shopt -s extglob
+
     
     local remove x
-    if type -P dircolors >/dev/null; then
+    if type -P trash-put >/dev/null; then
         remove=trash-put
     else
         remove="rm -rf"
     fi
     
-    if [[ $# -ge 3 ]]; then
+    if $nodir && [[ $# -eq 2 ]]; then
+        if [[ -e "$2" || -L "$2" ]]; then
+            $remove "$2"
+        elif [[ ! -d "$2/.." ]]; then
+            mkdir -p "$2/.."
+        fi
+    elif [[ $# -ge 2 ]]; then
         if [[ -d ${!#} ]]; then
             local oldcwd=$PWD
-            cd ${!#} # last arg
-            for x in "${@:1:$(($#-1))}"; do # all but last arg
-                # remove any trailing slashes
+            cd "${!#}" # last arg
+            for x in "${@:1:$(( $# - 1 ))}"; do # all but last arg
+                # remove any trailing slashes, uses extglob
                 x="${x%%+(/)}"
                 # remove any leading directory components
                 x="${x##*/}"
@@ -36,14 +55,10 @@ LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supporte
         else
             mkdir -p "${!#}"
         fi
-    elif [[ $# -eq 2 ]]; then
-        if [[ -e "$2" || -L "$2" ]]; then
-            $remove "$2"
-        elif [[ ! -d "$2/.." ]]; then
-            mkdir -p "$2/.."
-        fi
     elif  [[ $# -eq 1 ]]; then
         [[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
     fi
+
+    $reset_extglob && shopt -u extglob 
     ln -s -- "$@"
 }