Drop usage of `readlink -f`

Not portable to *BSD

Drop usage of `readlink -f`
Not portable to *BSD
Sergio Oliveira
1 parent 86ba2eb9
Showing 3 changed files with 9 additions and 4 deletions Show diff stats
server
test/bin/curl
test/test_helper.sh
 #!/bin/sh
  
-ROOTDIR="$(readlink -f $(dirname $0))"
-. $ROOTDIR/test/ip_helper.sh
+if [ -f test/ip_helper.sh ]; then
+  ROOTDIR=$(dirname $0)
+  . test/ip_helper.sh
+else
+  echo "E: must run $0 from the root of the repository!"
+  exit 1
+fi
  
 sudo -v
 sudo redir --lport 80  --cport 80  --caddr $reverseproxy &
@@ -5,7 +5,7 @@ set -e
 unset http_proxy
 unset https_proxy
  
-ROOTDIR=$(readlink -f $(dirname $0)/../..)
+ROOTDIR=$(dirname $0)/../..
 . $(dirname $0)/../ip_helper.sh
  
 /usr/bin/curl \
 export PATH="$(dirname $0)/bin:$PATH"
-export ROOTDIR="$(readlink -f $(dirname $0)/..)"
+export ROOTDIR="$(dirname $0)/.."
  
 run_on() {
   local vm="$1"
1	1	#!/bin/sh
2	2
3		-ROOTDIR="$(readlink -f $(dirname $0))"
4		-. $ROOTDIR/test/ip_helper.sh
	3	+if [ -f test/ip_helper.sh ]; then
	4	+ ROOTDIR=$(dirname $0)
	5	+ . test/ip_helper.sh
	6	+else
	7	+ echo "E: must run $0 from the root of the repository!"
	8	+ exit 1
	9	+fi
5	10
6	11	sudo -v
7	12	sudo redir --lport 80 --cport 80 --caddr $reverseproxy &
...	...
...	...	@@ -5,7 +5,7 @@ set -e
5	5	unset http_proxy
6	6	unset https_proxy
7	7
8		-ROOTDIR=$(readlink -f $(dirname $0)/../..)
	8	+ROOTDIR=$(dirname $0)/../..
9	9	. $(dirname $0)/../ip_helper.sh
10	10
11	11	/usr/bin/curl \
...	...
1	1	export PATH="$(dirname $0)/bin:$PATH"
2		-export ROOTDIR="$(readlink -f $(dirname $0)/..)"
	2	+export ROOTDIR="$(dirname $0)/.."
3	3
4	4	run_on() {
5	5	local vm="$1"
...	...