Skip to content

Commit

Permalink
fix installer scripts to work on zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwatch
kwatch committed Feb 19, 2012
1 parent 4197bbb commit 74cbfc2
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 14 deletions.
3 changes: 2 additions & 1 deletion installers/vs_install.sh
View file
Expand Up @@ -70,7 +70,8 @@ _generic_installer() {
esac esac
## donwload ## donwload
if [ ! -e "$filename" ]; then if [ ! -e "$filename" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "$untar $filename" || return 1 _cmd "$untar $filename" || return 1
Expand Down
3 changes: 2 additions & 1 deletion installers/vs_install_lua.sh
View file
Expand Up @@ -29,7 +29,8 @@ _install_lua() {
local base="lua-$version" local base="lua-$version"
local url="http://www.lua.org/ftp/$base.tar.gz" local url="http://www.lua.org/ftp/$base.tar.gz"
if [ ! -e "$base.tar.gz" ]; then if [ ! -e "$base.tar.gz" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "tar xzf $base.tar.gz" || return 1 _cmd "tar xzf $base.tar.gz" || return 1
Expand Down
3 changes: 2 additions & 1 deletion installers/vs_install_luajit.sh
View file
Expand Up @@ -20,7 +20,8 @@ _install_luajit() {
local url="http://luajit.org/download/$base.tar.gz" local url="http://luajit.org/download/$base.tar.gz"
local nice="nice -10" local nice="nice -10"
if [ ! -e "$base.tar.gz" ]; then if [ ! -e "$base.tar.gz" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "tar xzf $base.tar.gz" || return 1 _cmd "tar xzf $base.tar.gz" || return 1
Expand Down
6 changes: 4 additions & 2 deletions installers/vs_install_node.sh
View file
Expand Up @@ -41,7 +41,8 @@ _install_node() {
;; ;;
esac esac
if [ ! -e "$base.tar.gz" ]; then if [ ! -e "$base.tar.gz" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "$nice tar xzf $base.tar.gz" || return 1 _cmd "$nice tar xzf $base.tar.gz" || return 1
Expand All @@ -67,7 +68,8 @@ _install_node() {
y*|Y*) y*|Y*)
#_cmd "curl http://npmjs.org/install.sh | sh" || return 1 #_cmd "curl http://npmjs.org/install.sh | sh" || return 1
#_cmd "wget -qO - http://npmjs.org/install.sh | sh" || return 1 #_cmd "wget -qO - http://npmjs.org/install.sh | sh" || return 1
local down=`_downloader "-LRO" "-N"` || return 1 local down
down=`_downloader "-LRO" "-N"` || return 1
_cmd "$down http://npmjs.org/install.sh" || return 1 _cmd "$down http://npmjs.org/install.sh" || return 1
_cmd "sh install.sh" || return 1 _cmd "sh install.sh" || return 1
local npm_path=`which npm` local npm_path=`which npm`
Expand Down
3 changes: 2 additions & 1 deletion installers/vs_install_perl.sh
View file
Expand Up @@ -31,7 +31,8 @@ _install_perl() {
case "$input" in case "$input" in
y*|Y*) y*|Y*)
url="http://cpanmin.us/" url="http://cpanmin.us/"
local down=`_downloader "-Lo" "--no-check-certificate -O"` || return 1 local down
down=`_downloader "-Lo" "--no-check-certificate -O"` || return 1
_cmd "$down $prefix/bin/$script $url" || return 1 _cmd "$down $prefix/bin/$script $url" || return 1
_cmd "chmod a+x $prefix/bin/$script" || return 1 _cmd "chmod a+x $prefix/bin/$script" || return 1
_cmd "which $script" || return 1 _cmd "which $script" || return 1
Expand Down
6 changes: 4 additions & 2 deletions installers/vs_install_pypy.sh
View file
Expand Up @@ -34,7 +34,8 @@ _install_pypy() {
local base="pypy-$ver-$target" local base="pypy-$ver-$target"
local url="https://bitbucket.org/pypy/pypy/downloads/$base.tar.bz2" local url="https://bitbucket.org/pypy/pypy/downloads/$base.tar.bz2"
if [ ! -e "$base.tar.bz2" ]; then if [ ! -e "$base.tar.bz2" ]; then
local down=`_downloader "-LRO" "--no-check-certificate"` || return 1 local down
down=`_downloader "-LRO" "--no-check-certificate"` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "rm -rf $base" || return 1 _cmd "rm -rf $base" || return 1
Expand Down Expand Up @@ -87,7 +88,8 @@ _install_pypy() {
case "$input" in case "$input" in
y*|Y*) y*|Y*)
url="http://python-distribute.org/$script" url="http://python-distribute.org/$script"
local down=`_downloader "-ORL" "-N"` || return 1 local down
down=`_downloader "-ORL" "-N"` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
_cmd "$prefix/bin/pypy $script" || return 1 _cmd "$prefix/bin/pypy $script" || return 1
_cmd "which easy_install" || return 1 _cmd "which easy_install" || return 1
Expand Down
6 changes: 4 additions & 2 deletions installers/vs_install_python.sh
View file
Expand Up @@ -82,7 +82,8 @@ _install_python() {
local url="http://www.python.org/ftp/python/$ver/$filename" local url="http://www.python.org/ftp/python/$ver/$filename"
local nice="nice -10" local nice="nice -10"
if [ ! -e "$filename" ]; then if [ ! -e "$filename" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "rm -rf $base" || return 1 _cmd "rm -rf $base" || return 1
Expand Down Expand Up @@ -126,7 +127,8 @@ _install_python() {
case "$input" in case "$input" in
y*|Y*) y*|Y*)
url="http://python-distribute.org/$script" url="http://python-distribute.org/$script"
local down=`_downloader "-ORL" "-N"` || return 1 local down
down=`_downloader "-ORL" "-N"` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
_cmd "$prefix/bin/python $script" || return 1 _cmd "$prefix/bin/python $script" || return 1
_cmd "which easy_install" || return 1 _cmd "which easy_install" || return 1
Expand Down
6 changes: 4 additions & 2 deletions installers/vs_install_rubinius.sh
View file
Expand Up @@ -95,7 +95,8 @@ _install_rubinius() {
if [ "$kind" = "source" ]; then if [ "$kind" = "source" ]; then
base="rubinius-$version-$date" base="rubinius-$version-$date"
if [ ! -e "$base.tar.gz" ]; then if [ ! -e "$base.tar.gz" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $siteurl/$base.tar.gz" || return 1 _cmd "$down $siteurl/$base.tar.gz" || return 1
fi fi
_cmd "rm -rf rubinius-$version" || return 1 _cmd "rm -rf rubinius-$version" || return 1
Expand All @@ -108,7 +109,8 @@ _install_rubinius() {
else else
base="rubinius-$version-$kind" base="rubinius-$version-$kind"
if [ ! -e "$base.zip" ]; then if [ ! -e "$base.zip" ]; then
local down=`_downloader "-LRO" ""` || return 1 local down
down=`_downloader "-LRO" ""` || return 1
_cmd "$down $siteurl/$base.zip" || return 1 _cmd "$down $siteurl/$base.zip" || return 1
fi fi
_cmd "rm -rf $base" || return 1 _cmd "rm -rf $base" || return 1
Expand Down
6 changes: 4 additions & 2 deletions installers/vs_install_ruby.sh
View file
Expand Up @@ -55,7 +55,8 @@ _install_ruby() {
local url="ftp://ftp.ruby-lang.org/pub/ruby/$ver/$filename" local url="ftp://ftp.ruby-lang.org/pub/ruby/$ver/$filename"
local nice="nice -10" local nice="nice -10"
if [ ! -f "$filename" ]; then if [ ! -f "$filename" ]; then
local down=`_downloader "-ORL" "-N"` || return 1 local down
down=`_downloader "-ORL" "-N"` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
fi fi
_cmd "rm -rf $base" || return 1 _cmd "rm -rf $base" || return 1
Expand Down Expand Up @@ -85,7 +86,8 @@ _install_ruby() {
y*|Y*) y*|Y*)
base="rubygems-1.8.17" base="rubygems-1.8.17"
url="http://production.cf.rubygems.org/rubygems/$base.tgz" url="http://production.cf.rubygems.org/rubygems/$base.tgz"
local down=`_downloader "-ORL" "-N"` || return 1 local down
down=`_downloader "-ORL" "-N"` || return 1
_cmd "$down $url" || return 1 _cmd "$down $url" || return 1
_cmd "tar xzf $base.tgz" || return 1 _cmd "tar xzf $base.tgz" || return 1
_cmd "cd $base/" || return 1 _cmd "cd $base/" || return 1
Expand Down

0 comments on commit 74cbfc2

Please sign in to comment.