From fae0c9143e694a3ed895cee68d1adad9bc359f05 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Mon, 16 Feb 2015 02:05:05 -0800
Subject: [PATCH] update README for gitorious move
---
README | 9 +++------
lnf | 10 +++++-----
lnf-function | 10 +++++-----
test/test | 10 +++++-----
4 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/README b/README
index a960550..b3829e2 100644
--- a/README
+++ b/README
@@ -4,12 +4,9 @@ script files which sit next to this file.
Files ending in -function are for sourcing then calling as a function. Files
without -function are exactly the same except they are for calling as a script.
-Patches and bugs are very welcome via gitlab.
-
-Questions, feedback, etc are very welcome via email to Ian Kelling
-<ian@iankelling.org>. I will add any useful questions, answers, etc. to this
-file. If a mailing list / forum is ever called for, I will start one.
+Patches, bugs, and any feedback is very welcome via gitorious or email to
+Ian Kelling <ian@iankelling.org>.
This program is also part of a collection of programs,
-https://gitlab.com/iankelling/bash-programs-by-ian, which are unrelated except
+https://gitorious.org/bash-programs-by-ian, which are unrelated except
having the same author and being being bash programs.
diff --git a/lnf b/lnf
index 29f137d..c907b62 100755
--- a/lnf
+++ b/lnf
@@ -15,7 +15,7 @@ Create directory if needed. Slightly more restrictive arguments than ln.
In the 1st form, create a link to TARGET with the name LINK_NAME. In the 2nd
form, create a link to TARGET in the current directory. In the 3rd form, create
links to each TARGET in DIRECTORY."
-
+
if [[ $1 == --help || $# -eq 0 ]]; then
echo "$help"
return 0
@@ -30,19 +30,19 @@ links to each TARGET in DIRECTORY."
return 1
fi
fi
-
+
local reset_extglob=false
! shopt extglob >/dev/null && reset_extglob=true
shopt -s extglob
-
+
local remove x
if type -P trash-put >/dev/null; then
remove=trash-put
else
remove="rm -rf"
fi
-
+
if [[ $nodir ]]; then
if [[ -e "$2" || -L "$2" ]]; then
$remove "$2"
@@ -72,7 +72,7 @@ links to each TARGET in DIRECTORY."
[[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
fi
- $reset_extglob && shopt -u extglob
+ $reset_extglob && shopt -u extglob
ln -s $nodir -- "$@"
}
lnf "$@"
diff --git a/lnf-function b/lnf-function
index 9dbcef5..0d43112 100644
--- a/lnf-function
+++ b/lnf-function
@@ -15,7 +15,7 @@ Create directory if needed. Slightly more restrictive arguments than ln.
In the 1st form, create a link to TARGET with the name LINK_NAME. In the 2nd
form, create a link to TARGET in the current directory. In the 3rd form, create
links to each TARGET in DIRECTORY."
-
+
if [[ $1 == --help || $# -eq 0 ]]; then
echo "$help"
return 0
@@ -30,19 +30,19 @@ links to each TARGET in DIRECTORY."
return 1
fi
fi
-
+
local reset_extglob=false
! shopt extglob >/dev/null && reset_extglob=true
shopt -s extglob
-
+
local remove x
if type -P trash-put >/dev/null; then
remove=trash-put
else
remove="rm -rf"
fi
-
+
if [[ $nodir ]]; then
if [[ -e "$2" || -L "$2" ]]; then
$remove "$2"
@@ -72,6 +72,6 @@ links to each TARGET in DIRECTORY."
[[ -e "${1##*/}" || -L "${1##*/}" ]] && $remove "${1##*/}"
fi
- $reset_extglob && shopt -u extglob
+ $reset_extglob && shopt -u extglob
ln -s $nodir -- "$@"
}
diff --git a/test/test b/test/test
index afbb630..d3a5eac 100755
--- a/test/test
+++ b/test/test
@@ -12,14 +12,14 @@
case1() {
touch b
lnf -T a b
- [[ -L b ]]
+ [[ -L b ]]
}
# 2 arguments, test that directory in link location is removed and replaced with a link
case2() {
mkdir b
lnf -T a b
- [[ -L b ]]
+ [[ -L b ]]
}
# single argument, test that an existing non-empty directory is removed and replaced by a link
@@ -27,7 +27,7 @@ case3() {
mkdir a
touch a/b
lnf ../a
- [[ -L a ]]
+ [[ -L a ]]
}
# 4 arguments, 2 of the link locations already contain files.
@@ -37,14 +37,14 @@ case4() {
touch a/b
touch a/c
lnf b c d a
- [[ -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 ]]
+ [[ -L b/a ]]
}
--
2.30.2