From cfd62bfb8e29a8fdf8e32463b80c02fb71315559 Mon Sep 17 00:00:00 2001
From: Alexander Petrovsky <askjuise@gmail.com>
Date: Sun, 1 Apr 2018 10:26:27 +0300
Subject: Fix backup file creation by sed

---
 priv/templates/extended_bin | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index daa071b..06fed1a 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -233,14 +233,16 @@ replace_os_vars() {
 escript_emulator_args() {
     if [ -n "${VM_ARGS}" ]; then
         if grep -q '%%!' $1; then
-            cmd=$(echo sed -i"' '" "'/%%!.*/ s| ${VM_ARGS}||'" $1)
+            cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s| ${VM_ARGS}||'" $1)
             eval "$cmd"
-            cmd=$(echo sed -i"' '" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1)
+            cmd=$(echo sed -i"'.prev'" "'/%%!.*/ s|$| ${VM_ARGS}|'" $1)
             eval "$cmd"
+            rm ${1}.prev
         else
-            cmd=$(echo sed -i"' '" "'/#!.*/ a \\
+            cmd=$(echo sed -i"'.prev'" "'/#!.*/ a \\
 %%! ${VM_ARGS}\n'" $1)
             eval "$cmd"
+            rm ${1}.prev
         fi
     fi
 }
-- 
cgit v1.2.3


From 368832d66b856e8024664f1a8e6c69fe12f41433 Mon Sep 17 00:00:00 2001
From: Alexander Petrovsky <askjuise@gmail.com>
Date: Sun, 1 Apr 2018 12:35:31 +0300
Subject: Reorder replace_os_vars and node NAME assignment

---
 priv/templates/extended_bin | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 06fed1a..0381964 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -352,6 +352,9 @@ ERTS_LIB_DIR="$(dirname "$ERTS_DIR")/lib"
 
 VMARGS_PATH=$(add_path vm.args $VMARGS_PATH)
 
+VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH)
+RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH)
+
 # Check vm.args and other files referenced via -args_file parameters for:
 #    - nonexisting -args_files
 #    - circular dependencies of -args_files
@@ -437,9 +440,6 @@ esac
 # Export the variable so that it's available in the 'eval' calls
 export NAME
 
-VMARGS_PATH=$(check_replace_os_vars vm.args $VMARGS_PATH)
-RELX_CONFIG_PATH=$(check_replace_os_vars sys.config $RELX_CONFIG_PATH)
-
 # Make sure log directory exists
 mkdir -p "$RUNNER_LOG_DIR"
 
-- 
cgit v1.2.3