6 files changed, 14 insertions, 8 deletions
diff --git a/priv/templates/simpleapp_sup.erl b/priv/templates/simpleapp_sup.erl
index 931db75..477479f 100644
--- a/priv/templates/simpleapp_sup.erl
+++ b/priv/templates/simpleapp_sup.erl
@@ -1,4 +1,3 @@
-
 -module({{appid}}_sup).
 
 -behaviour(supervisor).
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.nodetool b/priv/templates/simplenode.nodetool
index 54ee6d6..ce06c6a 100755
--- a/priv/templates/simplenode.nodetool
+++ b/priv/templates/simplenode.nodetool
@@ -6,8 +6,6 @@
 %% nodetool: Helper Script for interacting with live nodes
 %%
 %% -------------------------------------------------------------------
--mode(compile).
-
 main(Args) ->
     ok = start_epmd(),
     %% Extract the args
diff --git a/priv/templates/simplenode.reltool.config b/priv/templates/simplenode.reltool.config
index 4189329..bac7270 100644
--- a/priv/templates/simplenode.reltool.config
+++ b/priv/templates/simplenode.reltool.config
@@ -19,9 +19,9 @@
        {boot_rel, "{{nodeid}}"},
        {profile, embedded},
        {incl_cond, derived},
-       {mod_cond, derived},
        {excl_archive_filters, [".*"]}, %% Do not archive built libs
-       {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)",
+       {excl_sys_filters, ["^bin/(?!start_clean.boot)",
+                           "^erts.*/bin/(dialyzer|typer)",
                            "^erts.*/(doc|info|include|lib|man|src)"]},
        {excl_app_filters, ["\.gitignore"]},
        {app, {{nodeid}}, [{mod_cond, app}, {incl_cond, include}]}
@@ -33,6 +33,8 @@
            {mkdir, "log/sasl"},
            {copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
            {copy, "files/nodetool", "\{\{erts_vsn\}\}/bin/nodetool"},
+           {copy, "{{nodeid}}/bin/start_clean.boot",
+                  "\{\{erts_vsn\}\}/bin/start_clean.boot"},
            {copy, "files/{{nodeid}}", "bin/{{nodeid}}"},
            {copy, "files/{{nodeid}}.cmd", "bin/{{nodeid}}.cmd"},
            {copy, "files/start_erl.cmd", "bin/start_erl.cmd"},
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
 
diff --git a/priv/templates/simplenode.windows.runner.cmd b/priv/templates/simplenode.windows.runner.cmd
index 16da5b9..d45f438 100644
--- a/priv/templates/simplenode.windows.runner.cmd
+++ b/priv/templates/simplenode.windows.runner.cmd
@@ -30,6 +30,7 @@
 @set epmd="%erts_bin%\epmd.exe"
 @set escript="%erts_bin%\escript.exe"
 @set werl="%erts_bin%\werl.exe"
+@set nodetool="%erts_bin%\nodetool"
 
 @if "%1"=="usage" @goto usage
 @if "%1"=="install" @goto install
@@ -38,13 +39,14 @@
 @if "%1"=="stop" @goto stop
 @if "%1"=="restart" @call :stop && @goto start
 @if "%1"=="console" @goto console
+@if "%1"=="ping" @goto ping
 @if "%1"=="query" @goto query
 @if "%1"=="attach" @goto attach
 @if "%1"=="upgrade" @goto upgrade
 @echo Unknown command: "%1"
 
 :usage
-@echo Usage: %~n0 [install^|uninstall^|start^|stop^|restart^|console^|query^|attach^|upgrade]
+@echo Usage: %~n0 [install^|uninstall^|start^|stop^|restart^|console^|ping^|query^|attach^|upgrade]
 @goto :EOF
 
 :install
@@ -71,6 +73,11 @@
 @start "%node_name% console" %werl% -boot "%node_boot_script%" -config "%sys_config%" -args_file "%vm_args%" -sname %node_name%
 @goto :EOF
 
+:ping
+@%escript% %nodetool% ping -sname "%node_name%" -setcookie "%erlang_cookie%"
+@exit %ERRORLEVEL%
+@goto :EOF
+
 :query
 @%erlsrv% list %service_name%
 @exit %ERRORLEVEL%