use different variables for different scopes, duh
This commit is contained in:
parent
9968aad7a6
commit
ae5313f39b
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue