change semantics to include all ln cases, but require option

diff --git a/lnf b/lnf
index bf497615a23b7196700cbfc75767b1606762f5e3..104c90187008bfd3caa40d9588ff44cd4d1a4f38 100755 (executable)
--- a/lnf
+++ b/lnf
@@ -3,16 +3,25 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 
 lnf() {
 # 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.
 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,
 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
         echo "$help"
         return 0
     fi

+
+    local nodir=false
+    if [[ $1 == -T ]]; then
+        nodir=true
+        shift
+    fi
+    

     
     local remove x
     if type -P dircolors >/dev/null; then
     
     local remove x
     if type -P dircolors >/dev/null; then


@@ -21,7 +30,13 @@ LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supporte
         remove="rm -rf"
     fi
     
         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
         if [[ -d ${!#} ]]; then
             local oldcwd=$PWD
             cd ${!#} # last arg


@@ -36,12 +51,6 @@ LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supporte
         else
             mkdir -p "${!#}"
         fi
         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
     elif  [[ $# -eq 1 ]]; then
         [[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
     fi

diff --git a/lnf-function b/lnf-function
index 7bc88f0c5847ccab79a067b7c3b1ad7313eb6b7b..61478e7cddab32b3e2e9834c3074e5097ada43e9 100644 (file)
--- a/lnf-function
+++ b/lnf-function
@@ -3,16 +3,25 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 
 lnf() {
 # 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.
 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,
 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
         echo "$help"
         return 0
     fi

+
+    local nodir=false
+    if [[ $1 == -T ]]; then
+        nodir=true
+        shift
+    fi
+    

     
     local remove x
     if type -P dircolors >/dev/null; then
     
     local remove x
     if type -P dircolors >/dev/null; then


@@ -21,7 +30,13 @@ LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supporte
         remove="rm -rf"
     fi
     
         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
         if [[ -d ${!#} ]]; then
             local oldcwd=$PWD
             cd ${!#} # last arg


@@ -36,12 +51,6 @@ LN_ARGUMENTS are passed to ln -s --, meaning no ln option arguments are supporte
         else
             mkdir -p "${!#}"
         fi
         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
     elif  [[ $# -eq 1 ]]; then
         [[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
     fi

diff --git a/test/test b/test/test
index 218b67c1ddd981ebadb9dd2c863c7730cd7ddfa9..afbb6306a3fed7172407340f09a3a964cd9fbc96 100755 (executable)
--- a/test/test
+++ b/test/test
@@ -11,14 +11,14 @@
 # 2 arguments, test that a file in the link location is removed and replaed with a link
 case1() {
     touch b
 # 2 arguments, test that a file in the link location is removed and replaed with a link
 case1() {
     touch b

-    lnf a b
+    lnf -T a b

     [[ -L b ]] 
 }
 
 # 2 arguments, test that directory in link location is removed and replaced with a link
 case2() {
     mkdir b
     [[ -L b ]] 
 }
 
 # 2 arguments, test that directory in link location is removed and replaced with a link
 case2() {
     mkdir b

-    lnf a b
+    lnf -T a b

     [[ -L b ]] 
 }
 
     [[ -L b ]] 
 }
 


@@ -40,20 +40,25 @@ case4() {
     [[ -L a/b && -L a/c && -L a/d ]] 
 }
 
     [[ -L a/b && -L a/c && -L a/d ]] 
 }
 

+# 2 arguments, test that link is made correctly
+case5() {
+    mkdir b
+    lnf a b
+    [[ -L b/a ]] 
+}
+
+
+

 cleanup() {
     rm -rf *
 }
 
 
 docases() {
 cleanup() {
     rm -rf *
 }
 
 
 docases() {

-    case1
-    cleanup
-    case2
-    cleanup
-    case3
-    cleanup
-    case4
-    cleanup
+    for x in {1..5}; do
+        case$x
+        cleanup
+    done

 }
 
 source ${0%/*}/../lnf-function
 }
 
 source ${0%/*}/../lnf-function