Permalink
Browse files

Merge pull request #479 from koenpunt/fix-args-replacement

string replacement turns out not POSIX compliant
  • Loading branch information...
2 parents 5ec0cce + 9c2127c commit fafbeb8c595c182776f5c0d7f654d11985cb3796 @ljharb ljharb committed Jul 18, 2014
Showing with 12 additions and 14 deletions.
  1. +6 −7 install.sh
  2. +6 −7 nvm.sh
View
@@ -16,13 +16,12 @@ nvm_download() {
curl $*
elif nvm_has "wget"; then
# Emulate curl with wget
- ARGS="$*"
- ARGS=${ARGS/--progress-bar /--progress=bar }
- ARGS=${ARGS/-L /}
- ARGS=${ARGS/-I /}
- ARGS=${ARGS/-s /-q }
- ARGS=${ARGS/-o /-O }
- ARGS=${ARGS/-C - /-c }
+ ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+ -e 's/-L //' \
+ -e 's/-I //' \
+ -e 's/-s /-q /' \
+ -e 's/-o /-O /' \
+ -e 's/-C - /-c /')
wget $ARGS
fi
}
View
13 nvm.sh
@@ -17,13 +17,12 @@ nvm_download() {
curl $*
elif nvm_has "wget"; then
# Emulate curl with wget
- ARGS="$*"
- ARGS=${ARGS/--progress-bar /--progress=bar }
- ARGS=${ARGS/-L /}
- ARGS=${ARGS/-I /}
- ARGS=${ARGS/-s /-q }
- ARGS=${ARGS/-o /-O }
- ARGS=${ARGS/-C - /-c }
+ ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+ -e 's/-L //' \
+ -e 's/-I //' \
+ -e 's/-s /-q /' \
+ -e 's/-o /-O /' \
+ -e 's/-C - /-c /')
wget $ARGS
fi
}

0 comments on commit fafbeb8

Please sign in to comment.