summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorolgeni <olgeni@olgeni.com>2013-06-10 22:15:49 +0200
committerolgeni <olgeni@olgeni.com>2013-06-10 22:15:49 +0200
commit505458eecb78f90e6c266cbaec9244e88d8c3f1e (patch)
treeebaa2db19a3c16675d5586501a72c855a62e5301 /priv
parent638569acc2a2947e0e2d8d159b1f8ff9e261a551 (diff)
Use "pwd -P" to get the current physical path.
It is a portable version of the realpath(1) utility that you can find on Mac OS X and FreeBSD (see also The Open Group Base Specifications Issue 6, IEEE Std 1003.1). Without the -P flag, pwd(1) might return different values when the current path contains one or more symlinks, depending on how you got into the current directory. In simplenode.runner, this may cause PIPE_DIR to have different values on each use, which will make it impossible to connect to the running node unless you guess the correct path yourself.
Diffstat (limited to 'priv')
-rw-r--r--priv/templates/simplenode.erl.script2
-rwxr-xr-xpriv/templates/simplenode.runner2
2 files changed, 2 insertions, 2 deletions
diff --git a/priv/templates/simplenode.erl.script b/priv/templates/simplenode.erl.script
index 7919d69..f4c63af 100644
--- a/priv/templates/simplenode.erl.script
+++ b/priv/templates/simplenode.erl.script
@@ -20,7 +20,7 @@ unset POSIX_SHELL
## start_clean.boot file available in $ROOTDIR/release/VSN.
# Determine the abspath of where this script is executing from.
-ERTS_BIN_DIR=$(cd ${0%/*} && pwd)
+ERTS_BIN_DIR=$(cd ${0%/*} && pwd -P)
# Now determine the root directory -- this script runs from erts-VSN/bin,
# so we simply need to strip off two dirs from the end of the ERTS_BIN_DIR
diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner
index 9835d92..c2ef258 100755
--- a/priv/templates/simplenode.runner
+++ b/priv/templates/simplenode.runner
@@ -15,7 +15,7 @@ fi
# clear it so if we invoke other scripts, they run as ksh
unset POSIX_SHELL
-RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd)
+RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd -P)
CALLER_DIR=$PWD