From ae5313f39bcad5dd7295106e230d26a6c8403cf2 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Sat, 23 Jun 2018 23:37:49 -0600
Subject: [PATCH] use different variables for different scopes, duh

---
 usr/share/install.sh        | 9 +++++----
 usr/share/install_helper.sh | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/usr/share/install.sh b/usr/share/install.sh
index a3798ba..bb24048 100644
--- a/usr/share/install.sh
+++ b/usr/share/install.sh
@@ -59,10 +59,11 @@ http_get()
 
 http_bash()
 {
-  _http_url=$1
-  my_args=${2:-}
-  my_tmp=$(mktemp)
-  $_my_http_get $_my_http_opts $_my_http_out "$my_tmp" "$_http_url"; bash "$my_tmp" $my_args; rm "$my_tmp"
+  _http_bash_url=$1
+  _http_bash_args=${2:-}
+  _http_bash_tmp=$(mktemp)
+  $_my_http_get $_my_http_opts $_my_http_out "$_http_bash_tmp" "$_http_bash_url"
+  bash "$_http_bash_tmp" $_http_bash_args; rm "$_http_bash_tmp"
 }
 
 detect_http_get
diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh
index 378e5df..c87eeee 100644
--- a/usr/share/install_helper.sh
+++ b/usr/share/install_helper.sh
@@ -132,7 +132,6 @@ tmp_npm="$tmp_node $TELEBIT_TMP/bin/npm"
 #https://git.coolaj86.com/coolaj86/telebit.js/archive/:tree:.tar.gz
 #https://git.coolaj86.com/coolaj86/telebit.js/archive/:tree:.zip
 set +e
-set -x
 my_unzip=$(type -p unzip)
 my_tar=$(type -p tar)
 # TODO extract to temporary directory, configure, copy etc, replace
@@ -153,7 +152,6 @@ else
   echo "Neither tar nor unzip found. Abort."
   exit 13
 fi
-set +x
 set -e
 
 pushd $TELEBIT_TMP >/dev/null