eplaced all references to "readlink -f" with BSD/OS X compatible "can…

…onical_readlink" function
coolaj86 · Oct 26, 2011 · 386b0bf · 386b0bf
2 parents 31f6152 + a29ce8b
commit 386b0bf
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/all-tests.sh b/all-tests.sh
@@ -1,6 +1,9 @@
 #! /usr/bin/env bash
 
-__filename=`readlink -f $0`
+# Define BSD-friendly canonicalized readlink
+canonical_readlink () { cd `dirname $1`; __filename=`basename $1`; if [ -h "$__filename" ]; then canonical_readlink `readlink $__filename`; else echo "`pwd -P`/$__filename"; fi }
+
+__filename=$(canonical_readlink $0)
 __dirname=`dirname $__filename`
 cd $__dirname
 

diff --git a/test/invalid-test.sh b/test/invalid-test.sh
@@ -1,6 +1,9 @@
 #! /usr/bin/env bash
 
-__filename=`readlink -f $0`
+# Define BSD-friendly canonicalized readlink
+canonical_readlink () { cd `dirname $1`; __filename=`basename $1`; if [ -h "$__filename" ]; then canonical_readlink `readlink $__filename`; else echo "`pwd -P`/$__filename"; fi }
+
+__filename=$(canonical_readlink $0)
 __dirname=`dirname $__filename`
 cd $__dirname
 

diff --git a/test/parse-test.sh b/test/parse-test.sh
@@ -1,5 +1,8 @@
 
-__filename=`readlink -f $0`
+# Define BSD-friendly canonicalized readlink
+canonical_readlink () { cd `dirname $1`; __filename=`basename $1`; if [ -h "$__filename" ]; then canonical_readlink `readlink $__filename`; else echo "`pwd -P`/$__filename"; fi }
+
+__filename=$(canonical_readlink $0)
 __dirname=`dirname $__filename`
 cd $__dirname
 

diff --git a/test/tokenizer-test.sh b/test/tokenizer-test.sh
@@ -1,6 +1,9 @@
 #! /usr/bin/env bash
 
-__filename=`readlink -f $0`
+# Define BSD-friendly canonicalized readlink
+canonical_readlink () { cd `dirname $1`; __filename=`basename $1`; if [ -h "$__filename" ]; then canonical_readlink `readlink $__filename`; else echo "`pwd -P`/$__filename"; fi }
+
+__filename=$(canonical_readlink $0)
 __dirname=`dirname $__filename`
 cd $__dirname
 

diff --git a/test/valid-test.sh b/test/valid-test.sh
@@ -1,5 +1,8 @@
 
-__filename=`readlink -f $0`
+# Define BSD-friendly canonicalized readlink
+canonical_readlink () { cd `dirname $1`; __filename=`basename $1`; if [ -h "$__filename" ]; then canonical_readlink `readlink $__filename`; else echo "`pwd -P`/$__filename"; fi }
+
+__filename=$(canonical_readlink $0)
 __dirname=`dirname $__filename`
 
 cd $__dirname