josh/telebit.js
1
0
Fork 0
forked from coolaj86/telebit.js
Code Issues Pull Requests Releases Wiki Activity

use different variables for different scopes, duh

Browse Source
This commit is contained in:
AJ ONeal 2018-06-23 23:37:49 -06:00
parent 9968aad7a6
commit ae5313f39b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr/share/install.sh
View File

@ -59,10 +59,11 @@ http_get()
http_bash() http_bash()
{ {
_http_url=$1 _http_bash_url=$1
my_args=${2:-} _http_bash_args=${2:-}
my_tmp=$(mktemp) _http_bash_tmp=$(mktemp)
$_my_http_get $_my_http_opts $_my_http_out "$my_tmp" "$_http_url"; bash "$my_tmp" $my_args; rm "$my_tmp" $_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 detect_http_get

2
usr/share/install_helper.sh
View File

@ -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:.tar.gz
#https://git.coolaj86.com/coolaj86/telebit.js/archive/:tree:.zip #https://git.coolaj86.com/coolaj86/telebit.js/archive/:tree:.zip
set +e set +e
set -x
my_unzip=$(type -p unzip) my_unzip=$(type -p unzip)
my_tar=$(type -p tar) my_tar=$(type -p tar)
# TODO extract to temporary directory, configure, copy etc, replace # TODO extract to temporary directory, configure, copy etc, replace
@ -153,7 +152,6 @@ else
echo "Neither tar nor unzip found. Abort." echo "Neither tar nor unzip found. Abort."
exit 13 exit 13
fi fi
set +x
set -e set -e
pushd $TELEBIT_TMP >/dev/null pushd $TELEBIT_TMP >/dev/null