From 84ecba46291c70651d7c864890f4144d60dbe4ff Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Fri, 20 Mar 2020 08:02:48 -0300
Subject: [PATCH] scripts: fix addon.d again by ensuring all arguments get
 passed - /proc/$$/cmdline is \0 terminated argument strings except for the
 last argument which has no terminus, so the last argument was being dropped
 by `while read` which requires input to be \n terminated - switch to a for
 loop, which will use the \n delimiter but also read the last argument; all
 arguments are still protected by quoting - clean up potentially breaking
 recovery env since $OLD_PATH no longer exists

---
 scripts/util_functions.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index 17e91531c..06ec55b9e 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -107,7 +107,7 @@ ensure_bb() {
   # Run in busybox environment to ensure consistent results
   # /proc/<pid>/cmdline shall be <interpreter> <script> <arguments...>
   local cmds=$($bb sh -o standalone -c "
-  tr '\0' '\n' < /proc/$$/cmdline | (while read -r arg; do
+  for arg in \$(tr '\0' '\n' < /proc/$$/cmdline); do
     if [ -z \"\$cmds\" ]; then
       # Skip the first argument as we want to change the interpreter
       cmds=\"sh -o standalone\"
@@ -115,7 +115,7 @@ ensure_bb() {
       cmds=\"\$cmds '\$arg'\"
     fi
   done
-  echo \$cmds)")
+  echo \$cmds")
 
   # Re-exec our script
   echo $cmds | $bb xargs $bb
@@ -151,7 +151,6 @@ recovery_cleanup() {
     fi
   done
   umount -l /dev/random) 2>/dev/null
-  export PATH=$OLD_PATH
   [ -z $OLD_LD_LIB ] || export LD_LIBRARY_PATH=$OLD_LD_LIB
   [ -z $OLD_LD_PRE ] || export LD_PRELOAD=$OLD_LD_PRE
   [ -z $OLD_LD_CFG ] || export LD_CONFIG_FILE=$OLD_LD_CFG