aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPanagiotis PJ Papadomitsos <[email protected]>2015-09-24 13:31:27 -0700
committerPanagiotis PJ Papadomitsos <[email protected]>2015-09-24 13:31:27 -0700
commit1e02a29ca9ac36002eb56c67e86f060b035cbd0e (patch)
tree31add5acc0be6b9367674f9e1d3bc72eb0778da7
parentf63d3ad3f42f4b6fc1cab196e19ddc98ba58e9b6 (diff)
downloadrelx-1e02a29ca9ac36002eb56c67e86f060b035cbd0e.tar.gz
relx-1e02a29ca9ac36002eb56c67e86f060b035cbd0e.tar.bz2
relx-1e02a29ca9ac36002eb56c67e86f060b035cbd0e.zip
Regression fix on startup script improvements
Fixed a regression that occurs when using readlink on a Mac, which crashes the startup script if the startup script is not a link but an actual file (which is the most common case)
-rwxr-xr-xpriv/templates/bin2
-rwxr-xr-xpriv/templates/extended_bin2
2 files changed, 2 insertions, 2 deletions
diff --git a/priv/templates/bin b/priv/templates/bin
index 3067259..0b439c3 100755
--- a/priv/templates/bin
+++ b/priv/templates/bin
@@ -2,7 +2,7 @@
set -e
-SCRIPT=$(readlink $0)
+SCRIPT=$(readlink $0 || true)
if [ -z $SCRIPT ]; then
SCRIPT=$0
fi;
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 1d4da54..f7955cb 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -2,7 +2,7 @@
set -e
-SCRIPT=$(readlink $0)
+SCRIPT=$(readlink $0 || true)
if [ -z $SCRIPT ]; then
SCRIPT=$0
fi;