aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Molinaro <[email protected]>2016-03-22 20:03:15 -0700
committerAnthony Molinaro <[email protected]>2016-03-22 20:03:15 -0700
commitdc3dbf8d539189a9714e88f80048f0c7d8cf6287 (patch)
tree2188b99fa851b810f921aa4c238b9c1ccf9aff07
parentfee01211334e8d104aaebea2ba98f89db442c067 (diff)
downloadrelx-dc3dbf8d539189a9714e88f80048f0c7d8cf6287.tar.gz
relx-dc3dbf8d539189a9714e88f80048f0c7d8cf6287.tar.bz2
relx-dc3dbf8d539189a9714e88f80048f0c7d8cf6287.zip
get nodename from erlang, not hostname
-rwxr-xr-xpriv/templates/extended_bin14
1 files changed, 3 insertions, 11 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 3c71c84..b873958 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -42,9 +42,9 @@ relx_get_pid() {
fi
}
-relx_get_longname() {
+relx_get_nodename() {
id="longname$(relx_gen_id)-${NAME}"
- "$BINDIR/erl" -boot start_clean -eval 'io:format("~s~n", [node()]), halt()' -noshell -name $id | sed -e 's/.*@//g'
+ "$BINDIR/erl" -boot start_clean -eval '[Host] = tl(string:tokens(atom_to_list(node()),"@")), io:format("~s~n", [Host]), halt()' -noshell ${NAME_TYPE} $id
}
# Connect to a remote node
@@ -189,15 +189,7 @@ case $NAME in
# Nothing to do
;;
*)
- # Add @hostname
- case $NAME_TYPE in
- -sname)
- NAME=$NAME@`hostname -s`
- ;;
- -name)
- NAME=$NAME@$(relx_get_longname)
- ;;
- esac
+ NAME=$NAME@$(relx_get_nodename)
;;
esac