tlevine/urchin
1
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

add -- after readlink

Browse Source
This commit is contained in:
Thomas Levine 2016-02-27 19:10:28 +00:00
parent dc53523deb
commit 40950a0b52
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
urchin
View File

@ -25,7 +25,7 @@ urchin_root() {
orig="$1" orig="$1"
fi fi
if test "$(readlink -f "$1")" = /; then if test "$(readlink -f -- "$1")" = /; then
# Stop traversing upwards at / # Stop traversing upwards at /
if test -d "$orig"; then if test -d "$orig"; then
origdir="$orig" origdir="$orig"
@ -35,7 +35,7 @@ urchin_root() {
echo "You need to create the .urchin directory in the root of your tests, echo "You need to create the .urchin directory in the root of your tests,
maybe like this: maybe like this:
mkdir '$(readlink -f "$(remove_trailing_slash "$origdir")")/.urchin' mkdir '$(readlink -f -- "$(remove_trailing_slash "$origdir")")/.urchin'
" >&2 " >&2
return 1 return 1
elif ! test -e "$current"; then elif ! test -e "$current"; then
@ -70,8 +70,8 @@ escape_slashes() {
} }
get_stdout_file() { get_stdout_file() {
root="$(readlink -f "$(urchin_root "$1")")" root="$(readlink -f -- "$(urchin_root "$1")")"
test_file="$(readlink -f "$1")" test_file="$(readlink -f -- "$1")"
eroot="$(escape_slashes "$root")" eroot="$(escape_slashes "$root")"
base="$(echo "$test_file" | sed "s/^$eroot/$eroot\/.urchin/")" base="$(echo "$test_file" | sed "s/^$eroot/$eroot\/.urchin/")"
if test -d "$1"; then if test -d "$1"; then
@ -373,9 +373,9 @@ if test -z "$I_AM_SOURCING_URCHIN_IN_A_TEST"; then
# Run or present the Molly guard. # Run or present the Molly guard.
if ! urchin_root "$1" > /dev/null; then if ! urchin_root "$1" > /dev/null; then
exit 1 exit 1
elif basename "$(readlink -f "$(urchin_root "$1")")" | elif basename "$(readlink -f -- "$(urchin_root "$1")")" |
grep -Fi 'test' > /dev/null || $force; then grep -Fi 'test' > /dev/null || $force; then
logfile="$(readlink -f "$(urchin_root "$1")/.urchin/.log")" logfile="$(readlink -f -- "$(urchin_root "$1")/.urchin/.log")"
printf '' > "$logfile" printf '' > "$logfile"
urchin_go "$1" "$shell_for_sh_tests" urchin_go "$1" "$shell_for_sh_tests"
else else