From: Ian Kelling Date: Mon, 9 Jun 2014 17:35:01 +0000 (-0700) Subject: change 2 argument semantics to make more sense X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=a5d3fe7ecee597e33e7081f45847a6c9f25a22fb;p=lnf change 2 argument semantics to make more sense --- diff --git a/lnf b/lnf index fa9b599..bf49761 100755 --- a/lnf +++ b/lnf @@ -6,7 +6,9 @@ lnf() { local help="lnf [--help] LN_ARGUMENTS... 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" +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 echo "$help" return 0 @@ -19,19 +21,21 @@ Create directory if needed. Finally, ln -s -- LN_ARGUMENTS" 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" + if [[ $# -ge 3 ]]; then + if [[ -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" + else + mkdir -p "${!#}" + fi elif [[ $# -eq 2 ]]; then if [[ -e "$2" || -L "$2" ]]; then $remove "$2" diff --git a/lnf-function b/lnf-function index 04fe924..7bc88f0 100644 --- a/lnf-function +++ b/lnf-function @@ -6,7 +6,9 @@ lnf() { local help="lnf [--help] LN_ARGUMENTS... 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" +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 echo "$help" return 0 @@ -19,19 +21,21 @@ Create directory if needed. Finally, ln -s -- LN_ARGUMENTS" 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" + if [[ $# -ge 3 ]]; then + if [[ -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" + else + mkdir -p "${!#}" + fi elif [[ $# -eq 2 ]]; then if [[ -e "$2" || -L "$2" ]]; then $remove "$2" diff --git a/test/test b/test/test index c2bdb6a..218b67c 100755 --- a/test/test +++ b/test/test @@ -1,42 +1,43 @@ #!/bin/bash # some basic sanity / verification -# assumes we have trash-put in path + # I don't recommend actually running this unless you have a reason to, # since it creates & deletes files, and being a test, it is not as thoroughly # inspected for bugs -err() { - echo error -} -# target linkname +# assumes we have trash-put in path, and that lnf-function is in .. to this files location + + +# 2 arguments, test that a file in the link location is removed and replaed with a link case1() { touch b lnf a b - [[ -L b ]] || err + [[ -L b ]] } -# target directory +# 2 arguments, test that directory in link location is removed and replaced with a link case2() { mkdir b lnf a b - [[ -L b/a ]] || err + [[ -L b ]] } -# target +# single argument, test that an existing non-empty directory is removed and replaced by a link case3() { mkdir a touch a/b lnf ../a - [[ -L a ]] || err + [[ -L a ]] } -# target target directory +# 4 arguments, 2 of the link locations already contain files. +# test that they got removed and replaced by links case4() { mkdir a touch a/b touch a/c lnf b c d a - [[ -L a/b && -L a/c && -L a/d ]] || err + [[ -L a/b && -L a/c && -L a/d ]] } cleanup() { @@ -58,14 +59,17 @@ docases() { source ${0%/*}/../lnf-function # might want to undo this if things go wrong # set -x -set -eE; + +# trap errors, and output a simple bash stack trace +set -E; trap 'echo "${BASH_COMMAND:+BASH_COMMAND=\"$BASH_COMMAND\" } ${FUNCNAME:+FUNCNAME=\"$FUNCNAME\" }${LINENO:+LINENO=\"$LINENO\" }\$?=$?"' ERR cd $(mktemp -d) docases -trash-put() { - rm -rf "$@" -} +# test again, using rm -rf in place of trash-put. +# assumes that rm is in /bin and trash-put is in /usr/bin +PATH="${PATH//:\/usr\/bin}" +PATH="${PATH//\/usr\/bin:}" docases -echo success +echo tests concluded