Skip to content

Commit c28f086

Browse files
Merge pull request TechEmpower#1691 from TechEmpower/remove-wget
Remove wget
2 parents af38c20 + d218e3a commit c28f086

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+72
-65
lines changed

frameworks/C++/ULib/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353

5454
# 1. Download ULib
5555
cd $IROOT
56-
fw_get -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
56+
fw_get -o ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
5757
fw_untar ULib-${ULIB_VERSION}.tar.gz
5858

5959
# 2. Compile application (userver_tcp)

frameworks/C++/cpoll_cppsp/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/cppsp.installed)
55

66
sudo apt-get install -y postgresql-server-dev-9.3 libpq-dev
77

8-
fw_get -O cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
8+
fw_get -o cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
99
fw_untar cppsp_0.2.3.tar.xz
1010

1111
# Using cp+rm over mv intentionally, because apparently this download

frameworks/C++/silicon/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CXX=/usr/bin/g++-4.9 ./install.sh $IROOT
99

1010
# Install microhttpd
1111
cd $DIR
12-
fw_get http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz
12+
fw_get -O http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz
1313
fw_untar libmicrohttpd-0.9.39.tar.gz
1414
cd libmicrohttpd-0.9.39
1515
./configure --prefix=$IROOT

frameworks/Java/vertx/install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ fw_depends java7
55
RETCODE=$(fw_exists ${IROOT}/vert.x-2.1.5.installed)
66
[ ! "$RETCODE" == 0 ] || { return 0; }
77

8-
fw_get http://dl.bintray.com/vertx/downloads/vert.x-2.1.5.tar.gz?direct=true -O vert.x-2.1.5.tar.gz
8+
fw_get http://dl.bintray.com/vertx/downloads/vert.x-2.1.5.tar.gz?direct=true -o vert.x-2.1.5.tar.gz
99
fw_untar vert.x-2.1.5.tar.gz
10-
wget http://central.maven.org/maven2/org/freemarker/freemarker/2.3.22/freemarker-2.3.22.jar -O ${IROOT}/vert.x-2.1.5/lib/freemarker-2.3.22.jar
11-
touch ${IROOT}/vert.x-2.1.5.installed
10+
fw_get http://central.maven.org/maven2/org/freemarker/freemarker/2.3.22/freemarker-2.3.22.jar -o $IROOT/vert.x-2.1.5/lib/freemarker-2.3.22.jar
11+
12+
touch $IROOT/vert.x-2.1.5.installed

frameworks/PHP/Yii2/setup_hhvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
1212

1313
export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
1414

15-
hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
16-
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
15+
hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
16+
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/codeigniter/setup_hhvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
1717

1818
export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
1919

20-
hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
21-
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
20+
hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
21+
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/hhvm/run-debug.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22

3-
hhvm --config ./deploy/config-debug.hdf -m server
3+
hhvm -m server --config ./deploy/config-debug.hdf
44
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
5-

frameworks/PHP/hhvm/run.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22

3-
hhvm --config ./deploy/config.hdf -m server
3+
hhvm -m server --config ./deploy/config.hdf
44
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
5-

frameworks/PHP/php-laravel/setup_hhvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ sed -i 's|/home/vagrant/FrameworkBenchmarks/installs/nginx/|'"${IROOT}"'/nginx/|
1515

1616
export PATH="${PHP_HOME}/bin:${PHP_HOME}/sbin:$PATH"
1717

18-
hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
18+
hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
1919
${NGINX_HOME}/sbin/nginx -c ${TROOT}/deploy/nginx.conf

frameworks/PHP/php-pimf/pimf-framework/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ before_script:
1111

1212
script:
1313
- phpunit --configuration phpunit.xml --coverage-clover=coverage.clover
14-
- wget https://scrutinizer-ci.com/ocular.phar
14+
- curl -Os https://scrutinizer-ci.com/ocular.phar
1515
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
1616

1717
notifications:

frameworks/PHP/php-slim/setup_hhvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
1313

1414
export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
1515

16-
hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
16+
hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
1717
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/symfony2/setup_hhvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ ${PHP_HOME}/bin/php app/console cache:clear \
1717
${PHP_HOME}/bin/php app/console cache:warmup \
1818
--env=prod --no-debug
1919

20-
hhvm --config $TROOT/deploy/config.hdf --user $(whoami) -m daemon
21-
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf
20+
hhvm -m daemon --config $TROOT/deploy/config.hdf --user $(whoami)
21+
$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

frameworks/Python/historical/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ $PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requi
1313
cd $TROOT/webware
1414
rm -fr Webware Webware-1.1.1
1515
rm Webware-1.1.1.tar.gz
16-
wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
17-
tar -xf Webware-1.1.1.tar.gz
16+
fw_get downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz -O
17+
fw_untar Webware-1.1.1.tar.gz
1818
cp -r app/ Webware-1.1.1/

frameworks/Ur/urweb/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COMPILER=${IROOT}/urweb
66
RETCODE=$(fw_exists $COMPILER)
77
[ ! "$RETCODE" == 0 ] || [ ! `$COMPILER | grep -oE '[^ ]+$'` == "$VERSION" ] || { return 0; }
88

9-
fw_get http://www.impredicative.com/ur/urweb-$VERSION.tgz
9+
fw_get -O http://www.impredicative.com/ur/urweb-$VERSION.tgz
1010
fw_untar urweb-$VERSION.tgz
1111
cd urweb-$VERSION
1212
./configure --prefix=${IROOT}/urweb

toolset/setup/linux/bash_functions.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ fw_get () {
1414

1515
# -no-verbose disables the big progress bars but keeps
1616
# other basic info
17-
wget --no-verbose --no-check-certificate \
18-
--trust-server-names "$@"
17+
#wget --no-verbose --no-check-certificate \
18+
# --trust-server-names "$@"
19+
# DEPRECATED - older versions of wget use SSLv3 for handshaking
20+
# and therefore don't work (Ubuntu12, for instance).
21+
# Use curl instead (-s means silent; -L means follow 3xx responses)
22+
curl -sL "$@"
1923

2024
# Ensure the background job is killed if we are
2125
kill $!; trap 'kill $!' SIGTERM

toolset/setup/linux/database.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ if [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
102102
sudo apt-get remove -y postgresql postgresql-9.1 postgresql-client-9.1
103103

104104
echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
105-
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
105+
#wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
106+
curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
106107
sudo apt-get update
107108
sudo apt-get install -y postgresql-9.3 postgresql-client-9.3
108109
sudo service postgresql start
@@ -171,7 +172,8 @@ sudo addgroup --system cassandra
171172
sudo adduser --system --home /ssd/cassandra --no-create-home --ingroup cassandra cassandra
172173

173174
export CASS_V=2.0.12
174-
wget -nv http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
175+
#wget -nv http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
176+
curl -Os http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
175177
sudo tar xzf apache-cassandra-$CASS_V-bin.tar.gz -C /opt
176178
sudo ln -s /opt/apache-cassandra-$CASS_V /opt/cassandra
177179

@@ -215,7 +217,8 @@ fi
215217
echo "Setting up Elasticsearch"
216218

217219
export ES_V=1.5.0
218-
wget -nv https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
220+
#wget -nv https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
221+
curl -Os https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
219222
sudo tar zxf elasticsearch-$ES_V.tar.gz -C /opt
220223
sudo ln -s /opt/elasticsearch-$ES_V /opt/elasticsearch
221224

toolset/setup/linux/frameworks/duda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists duda-0.23.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://duda.io/releases/duda-client/dudac-0.23.tar.gz -O dudac-0.23.tar.gz
6+
fw_get http://duda.io/releases/duda-client/dudac-0.23.tar.gz -O
77
fw_untar dudac-0.23.tar.gz
88

99
cd dudac-0.23

toolset/setup/linux/frameworks/grails.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/grails-2.4.4.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.4.4.zip -O grails-2.4.4.zip
6+
fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.4.4.zip -O
77
fw_unzip grails-2.4.4.zip
88

99
touch ${IROOT}/grails-2.4.4.installed

toolset/setup/linux/frameworks/play1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/play-1.2.5.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O play-1.2.5.zip
6+
fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O
77
fw_unzip play-1.2.5.zip
88

99
touch ${IROOT}/play-1.2.5.installed

toolset/setup/linux/frameworks/play2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
RETCODE=$(fw_exists play-2.2.0)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip -O play-2.2.0.zip
6+
fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip -O
77
fw_unzip play-2.2.0.zip

toolset/setup/linux/frameworks/treefrog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/treefrog.installed)
55

66
sudo apt-get install -y qt4-qmake libqt4-dev libqt4-sql-mysql libqt4-sql-psql g++
77

8-
fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz -O treefrog-1.7.7.tar.gz
8+
fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz -O
99
fw_untar treefrog-1.7.7.tar.gz
1010
cd treefrog-1.7.7
1111
# Someday we can try this... I couldn't get it working

toolset/setup/linux/frameworks/wt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ elif [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
2626
sudo apt-get -y install libboost1.48-all-dev
2727
fi
2828

29-
fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O wt-3.3.3.tar.gz
29+
fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O
3030
fw_untar wt-3.3.3.tar.gz
3131

3232
cd wt-3.3.3

toolset/setup/linux/languages/crystal-0.7.1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ URL=https://github.com/manastech/crystal/releases/download/0.7.1/crystal-0.7.1-1
77

88
# Default filename is too long, causing problems
99
# Use -O to specify
10-
fw_get -O $SAVE_AS $URL
10+
fw_get -o $SAVE_AS $URL
1111

1212
fw_untar crystal-0.7.1-1-linux-x86_64.tar.gz
1313

toolset/setup/linux/languages/dart.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/dart-sdk.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://storage.googleapis.com/dart-archive/channels/stable/release/42828/sdk/dartsdk-linux-x64-release.zip
6+
fw_get -O http://storage.googleapis.com/dart-archive/channels/stable/release/42828/sdk/dartsdk-linux-x64-release.zip
77
fw_unzip dartsdk-linux-x64-release.zip
88

99
touch ${IROOT}/dart-sdk.installed

toolset/setup/linux/languages/dlang.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${DLANG}.installed)
77
return 0; }
88

99
mkdir -p $DLANG
10-
fw_get http://downloads.dlang.org/releases/2.x/2.067.1/dmd_2.067.1-0_amd64.deb
10+
fw_get -O http://downloads.dlang.org/releases/2.x/2.067.1/dmd_2.067.1-0_amd64.deb
1111
dpkg-deb -x dmd_2.067.1-0_amd64.deb $DLANG
1212

1313
# According to this file (dmd.conf) dmd will, upon execution, look for

toolset/setup/linux/languages/elixir.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ VERSION="1.0.4-1"
1010
RELEASE="trusty"
1111
ARCH="amd64"
1212

13-
fw_get http://packages.erlang-solutions.com/site/esl/elixir/FLAVOUR_2_download/elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
13+
fw_get -O http://packages.erlang-solutions.com/site/esl/elixir/FLAVOUR_2_download/elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
1414
dpkg -x elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb $IROOT/elixir
1515
$IROOT/erlang/usr/lib/erlang/Install -minimal $IROOT/erlang/usr/lib/erlang
1616

toolset/setup/linux/languages/erlang.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ VERSION="17.4-2"
77
RELEASE="trusty"
88
ARCH="amd64"
99

10-
fw_get http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_esl/esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
10+
fw_get -O http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_esl/esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
1111
dpkg -x esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb $IROOT/erlang
1212
$IROOT/erlang/usr/lib/erlang/Install -minimal $IROOT/erlang/usr/lib/erlang
1313

toolset/setup/linux/languages/go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/go1.4.2.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
6+
fw_get -O https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
77
fw_untar go1.4.2.linux-amd64.tar.gz
88

99
touch ${IROOT}/go1.4.2.installed

toolset/setup/linux/languages/hhvm.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ RETCODE=$(fw_exists ${IROOT}/hhvm.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

66
sudo add-apt-repository -y ppa:mapnik/v2.2.0
7-
wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
7+
#wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
8+
curl -Os http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
89
echo deb http://dl.hhvm.com/ubuntu `lsb_release -sc` main | sudo tee /etc/apt/sources.list.d/hhvm.list
910
sudo apt-get update
1011
sudo apt-get install -y hhvm
1112

12-
touch ${IROOT}/hhvm.installed
13+
touch $IROOT/hhvm.installed

toolset/setup/linux/languages/java7.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ sudo apt-get install -y openjdk-7-jdk
1616

1717
# Setup environment variables
1818
echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`" > $IROOT/java7.installed
19-
echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java7.installed
19+
echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java7.installed

toolset/setup/linux/languages/nvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/nvm.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh
6+
fw_get -O https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh
77
NVM_DIR=$IROOT/nvm bash install.sh
88

9-
touch ${IROOT}/nvm.installed
9+
touch ${IROOT}/nvm.installed

toolset/setup/linux/languages/perl.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
RETCODE=$(fw_exists ${IROOT}/perl-5.18.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get https://raw.github.com/tokuhirom/Perl-Build/master/perl-build -O perl-build.pl
6+
fw_get https://raw.github.com/tokuhirom/Perl-Build/master/perl-build -o perl-build.pl
77
# compile with optimizations, n.b. this does not turn on debugging
88
perl perl-build.pl -DDEBUGGING=-g 5.18.2 perl-5.18 2>&1 | tee $IROOT/perl-install.log | awk '{ if (NR%100 == 0) printf "."}'
99

10-
fw_get http://cpanmin.us -O cpanminus.pl
10+
fw_get http://cpanmin.us -o cpanminus.pl
1111
perl-5.18/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
1212
# Install only a bare-bones of Perl modules
1313
# Install others in the per-framework install script or cpanfile

toolset/setup/linux/languages/php.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RETCODE=$(fw_exists ${IROOT}/php.installed)
1313

1414
VERSION="5.5.17"
1515

16-
fw_get http://php.net/distributions/php-${VERSION}.tar.gz -O php-${VERSION}.tar.gz
16+
fw_get http://php.net/distributions/php-${VERSION}.tar.gz -o php-${VERSION}.tar.gz
1717
fw_untar php-${VERSION}.tar.gz
1818
mv php-${VERSION} php
1919
cd php

toolset/setup/linux/languages/pypy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/pypy.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux64.tar.bz2 -O pypy-2.6.0-linux64.tar.bz2
6+
fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux64.tar.bz2 -o pypy-2.6.0-linux64.tar.bz2
77
fw_untar pypy-2.6.0-linux64.tar.bz2
88
ln -sf pypy-2.6.0-linux64 pypy
99

toolset/setup/linux/languages/python2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/py2.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
6+
fw_get -O http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
77
fw_untar Python-2.7.10.tgz
88
cd Python-2.7.10
99
./configure --prefix=${IROOT}/py2 --disable-shared --quiet

toolset/setup/linux/languages/python3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/py3.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz
6+
fw_get -O http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz
77
fw_untar Python-3.4.3.tar.xz
88
cd Python-3.4.3
99
./configure --prefix=${IROOT}/py3 --disable-shared --with-computed-gotos --quiet

toolset/setup/linux/languages/racket.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ if [ "$RET" == 0 ]; then
55
return 0;
66
fi
77

8-
fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -O racket-src.tar.gz
8+
fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -o racket-src.tar.gz
99
fw_untar racket-src.tar.gz
1010
mv racket racket-install
1111
cd racket-install/src
1212
./configure --prefix=${IROOT}/racket
1313
make
1414
make install
1515

16-
touch ${IROOT}/racket.installed
16+
touch ${IROOT}/racket.installed

toolset/setup/linux/languages/ringojs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists ${IROOT}/ringojs_0.10.installed)
44
[ ! "$RETCODE" == 0 ] || { return 0; }
55

6-
fw_get http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
6+
fw_get -O http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
77
sudo apt-get install -y jsvc
88
sudo dpkg -i ringojs_0.10-1_all.deb
99

toolset/setup/linux/languages/rust.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RETCODE=$(fw_exists $IROOT/rust.installed)
44
[ ! "$RETCODE" == 0 ] || { . $IROOT/rust.installed; return 0; }
55

6-
fw_get https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
6+
fw_get -O https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
77
fw_untar rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
88
(
99
cd rust-1.0.0-x86_64-unknown-linux-gnu

0 commit comments

Comments
 (0)