X-Git-Url: https://iankelling.org/git/?p=lnf;a=blobdiff_plain;f=lnf-function;h=daae096c035f51d63500a5f526d79403e260a6ee;hp=04fe9242c35f80e8cb579e7d85a9e0fa14dae919;hb=0e81e42e5faadf13bb6ef9fe6650f57cbce7422b;hpb=15c4639b1ee74247ac931088eea77e3ea37ba7c3

diff --git a/lnf-function b/lnf-function
index 04fe924..daae096 100644
--- a/lnf-function
+++ b/lnf-function
@@ -3,43 +3,62 @@
 # 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. Finally, ln -s -- LN_ARGUMENTS"
-    if [[ $1 == --help ]]; then
+Create directory if needed. Small change to ln argument semantics: for 2 arguments,
+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 && ! -d ${!#} ]]; then
-        mkdir -p "${!#}"
-    elif [[ $# -ge 2 && -d ${!#} ]]; then
-        local oldcwd=$PWD
-        cd ${!#} # last arg
-        for x in "${@:1:$(($#-1))}"; do # all but last arg
-            # remove any trailing slashes
-            x="${x%%+(/)}"
-            # remove any leading directory components
-            x="${x##*/}"
-            [[ -e "$x" || -L "$x" ]] && $remove "$x"
-        done
-        cd "$oldcwd"
-    elif [[ $# -eq 2 ]]; 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, uses extglob
+                x="${x%%+(/)}"
+                # remove any leading directory components
+                x="${x##*/}"
+                [[ -e "$x" || -L "$x" ]] && $remove "$x"
+            done
+            cd "$oldcwd"
+        else
+            mkdir -p "${!#}"
+        fi
     elif  [[ $# -eq 1 ]]; then
         [[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
     fi
+
+    $reset_extglob && shopt -u extglob 
     ln -s -- "$@"
 }