Fixed up some wget issues

frameworks/Python/historical/webware/setup.sh

@@ -2,13 +2,13 @@
 
 fw_depends python2 apache
 
-$PY2_ROOT/bin/pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
+pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
 
 cd webware 
 rm -fr Webware Webware-1.1.1 Webware-1.1.1.tar.gz
 
-wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
-tar -xf Webware-1.1.1.tar.gz
+fw_get -O https://downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
+fw_untar Webware-1.1.1.tar.gz
 cp -r app/ Webware-1.1.1/
 
 cd $TROOT/webware/Webware-1.1.1

frameworks/Ur/urweb/setup.sh

@@ -6,7 +6,7 @@ COMPILER=${IROOT}/urweb
 RETCODE=$(fw_exists ${COMPILER}.installed)
 [ "$RETCODE" == 0 ] || { \
   cd $IROOT
-  fw_get http://www.impredicative.com/ur/urweb-$VERSION.tgz
+  fw_get -O http://www.impredicative.com/ur/urweb-$VERSION.tgz
   fw_untar urweb-$VERSION.tgz
   cd urweb-$VERSION
   ./configure --prefix=$IROOT/urweb

toolset/setup/linux/frameworks/cppsp.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${IROOT}/cppsp.installed)
   source $IROOT/cppsp.installed
   return 0; }
 
-fw_get -O cppsp_$VERSION.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_$VERSION.tar.xz
+fw_get -o cppsp_$VERSION.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_$VERSION.tar.xz
 fw_untar cppsp_$VERSION.tar.xz
 
 # Using cp+rm over mv intentionally, because apparently this download

toolset/setup/linux/frameworks/duda.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${DUDA}.installed)
   source $DUDA.installed
   return 0; }
 
-fw_get http://duda.io/releases/duda-client/dudac-$VERSION.tar.gz -O
+fw_get -O http://duda.io/releases/duda-client/dudac-$VERSION.tar.gz
 fw_untar dudac-$VERSION.tar.gz
 
 DUDA_HOME=$IROOT/dudac-$VERSION

toolset/setup/linux/frameworks/grails.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${IROOT}/grails-2.4.4.installed)
   source $GRAILS_HOME.installed
   return 0; }
 
-fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-$VERSION.zip -O
+fw_get -O http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-$VERSION.zip
 fw_unzip grails-$VERSION.zip
 
 echo "export GRAILS_HOME=${GRAILS_HOME}" > $GRAILS_HOME.installed

toolset/setup/linux/frameworks/play1.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${IROOT}/play1.installed)
   source $IROOT/play1.installed
   return 0; }
 
-fw_get http://downloads.typesafe.com/releases/play-$VERSION.zip -O
+fw_get -O http://downloads.typesafe.com/releases/play-$VERSION.zip
 fw_unzip play-$VERSION.zip
 
 echo "export PLAY1_HOME=${PLAY1_HOME}" > $IROOT/play1.installed

toolset/setup/linux/frameworks/play2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-RETCODE=$(fw_exists play-2.2.0)
-[ ! "$RETCODE" == 0 ] || { return 0; }
-
-fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip -O
-fw_unzip play-2.2.0.zip

toolset/setup/linux/frameworks/treefrog.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${IROOT}/treefrog.installed)
 
 sudo apt-get install -y qt4-qmake libqt4-dev libqt4-sql-mysql libqt4-sql-psql g++
 
-fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz -O
+fw_get -O http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz
 fw_untar treefrog-1.7.7.tar.gz
 cd treefrog-1.7.7
 # Someday we can try this... I couldn't get it working

toolset/setup/linux/frameworks/vertx.sh

@@ -8,9 +8,9 @@ RETCODE=$(fw_exists ${VERTX_HOME}.installed)
   source $VERTX_HOME.installed
   return 0; }
 
-fw_get http://dl.bintray.com/vertx/downloads/vert.x-${VERSION}.tar.gz?direct=true -O vert.x-${VERSION}.tar.gz
+fw_get -o vert.x-${VERSION}.tar.gz http://dl.bintray.com/vertx/downloads/vert.x-${VERSION}.tar.gz?direct=true
 fw_untar vert.x-${VERSION}.tar.gz
-fw_get http://central.maven.org/maven2/org/freemarker/freemarker/${FREEMAKER_VERSION}/freemarker-${FREEMAKER_VERSION}.jar -o $IROOT/vert.x-${VERSION}/lib/freemarker-${FREEMAKER_VERSION}.jar
+fw_get -o $IROOT/vert.x-${VERSION}/lib/freemarker-${FREEMAKER_VERSION}.jar http://central.maven.org/maven2/org/freemarker/freemarker/${FREEMAKER_VERSION}/freemarker-${FREEMAKER_VERSION}.jar
 
 echo "export VERTX_HOME=${VERTX_HOME}" > $VERTX_HOME.installed
 echo -e "export PATH=${VERTX_HOME}/bin:\$PATH" >> $VERTX_HOME.installed

toolset/setup/linux/frameworks/wt.sh

@@ -22,7 +22,7 @@ RETCODE=$(fw_exists ${IROOT}/wt.installed)
 # main reasons for compilation from a specific source version), so we can 
 # just use apt. See https://github.com/TechEmpower/FrameworkBenchmarks/issues/1013
 #
-#fw_get http://downloads.sourceforge.net/project/boost/boost/1.48.0/boost_1_48_0.tar.gz -O boost_1_48_0.tar.gz
+#fw_get -o boost_1_48_0.tar.gz http://downloads.sourceforge.net/project/boost/boost/1.48.0/boost_1_48_0.tar.gz
 #fw_untar boost_1_48_0.tar.gz
 #cd boost_1_48_0
 #./bootstrap.sh --prefix=$IROOT/boost
@@ -37,7 +37,7 @@ elif [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
     sudo apt-get -y install libboost1.48-all-dev
 fi
 
-fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O
+fw_get -O http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz
 fw_untar wt-3.3.3.tar.gz
 
 cd wt-3.3.3

toolset/setup/linux/languages/lua.sh

@@ -7,8 +7,8 @@ RETCODE=$(fw_exists ${LUA}.installed)
   source $LUA.installed
   return 0; }
 
-fw_get https://github.com/LuaDist/lua/archive/5.1.5-Ubuntu-x86_64.tar.gz
-fw_untar 5.1.5-Ubuntu-x86_64
+fw_get -O https://github.com/LuaDist/lua/archive/5.1.5-Ubuntu-x86_64.tar.gz
+fw_untar 5.1.5-Ubuntu-x86_64.tar.gz
 
 LUA_HOME=$IROOT/lua-5.1.5-Ubuntu-x86_64
 echo "export LUA_HOME=${LUA_HOME}" > $LUA.installed

toolset/setup/linux/languages/nim.sh

@@ -14,7 +14,7 @@ git checkout $NIM_VERSION
 
 # Fixes a complex http request issue in 0.10.2:
 # https://github.com/Araq/Nim/pull/1848
-fw_get https://patch-diff.githubusercontent.com/raw/Araq/Nim/pull/1848.patch
+fw_get -O https://patch-diff.githubusercontent.com/raw/Araq/Nim/pull/1848.patch
 git apply 1848.patch
 rm 1848.patch
 

toolset/setup/linux/languages/perl.sh

@@ -7,11 +7,11 @@ RETCODE=$(fw_exists ${PERL}.installed)
   source $PERL.installed
   return 0; }
 
-fw_get https://raw.github.com/tokuhirom/Perl-Build/master/perl-build -o perl-build.pl
+fw_get -o perl-build.pl https://raw.github.com/tokuhirom/Perl-Build/master/perl-build
 # compile with optimizations, n.b. this does not turn on debugging
 perl perl-build.pl -DDEBUGGING=-g 5.18.2 perl-$VERSION 2>&1 | tee $IROOT/perl-install.log | awk '{ if (NR%100 == 0) printf "."}'
 
-fw_get http://cpanmin.us -o cpanminus.pl
+fw_get -o cpanminus.pl http://cpanmin.us
 perl-$VERSION/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
 # Install only a bare-bones of Perl modules
 # Install others in the per-framework install script or cpanfile

toolset/setup/linux/languages/php.sh

@@ -15,7 +15,7 @@ RETCODE=$(fw_exists ${IROOT}/php.installed)
 VERSION="5.5.17"
 PHP_HOME=$IROOT/php-$VERSION
 
-fw_get http://php.net/distributions/php-${VERSION}.tar.gz -o php-${VERSION}.tar.gz
+fw_get -o php-${VERSION}.tar.gz http://php.net/distributions/php-${VERSION}.tar.gz
 fw_untar php-${VERSION}.tar.gz
 mv php-${VERSION} php
 cd php

toolset/setup/linux/languages/pypy.sh

@@ -6,11 +6,11 @@ RETCODE=$(fw_exists ${PYPY_ROOT}.installed)
   source $PYPY_ROOT.installed
   return 0; }
 
-fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2 -o pypy-2.5.0-linux64.tar.bz2
+fw_get -o pypy-2.5.0-linux64.tar.bz2 https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.0-linux64.tar.bz2
 fw_untar pypy-2.5.0-linux64.tar.bz2
 ln -sf pypy-2.5.0-linux64 pypy
 
-fw_get https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+fw_get -o get-pip.py https://bootstrap.pypa.io/get-pip.py
 
 # Ensure pip is installed
 $PYPY_ROOT/bin/pypy get-pip.py

toolset/setup/linux/languages/racket.sh

@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${RACKET}.installed)
   source $RACKET.installed
   return 0; }
 
-fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -o racket-src.tar.gz
+fw_get -o racket-src.tar.gz http://mirror.racket-lang.org/installers/recent/racket-src.tgz
 fw_untar racket-src.tar.gz
 mv racket racket-install
 cd racket-install/src 

toolset/setup/linux/languages/ringojs.sh

@@ -8,7 +8,7 @@ RETCODE=$(fw_exists ${RINGOJS}.installed)
   source $RINGOJS.installed
   return 0; }
 
-fw_get https://github.com/ringo/ringojs/releases/download/v$VERSION.0/ringojs-$VERSION.tar.gz -O
+fw_get -O https://github.com/ringo/ringojs/releases/download/v$VERSION.0/ringojs-$VERSION.tar.gz
 fw_untar ringojs-$VERSION.tar.gz
 
 echo "export RINGOJS_HOME=${RINGOJS_HOME}" > $RINGOJS.installed

toolset/setup/linux/prerequisites.sh

@@ -14,6 +14,13 @@ RETCODE=$(fw_exists fwbm_prereqs_installed)
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
 
+# Add postgresql-server-dev-9.3 libs in "precise" version of Ubuntu
+if [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
+  curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  sudo apt-get update
+fi
+
 # One -q produces output suitable for logging (mostly hides
 # progress indicators)
 sudo apt-get -yq update
@@ -45,7 +52,7 @@ sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
   libsasl2-dev                      `# Needed by mgo for go-mongodb test` \
   llvm-dev                          `# Required for correct Ruby installation` \
   libboost-dev                      `# Silicon relies on boost::lexical_cast.` \
-  postgresql-server-dev-9.3         `# Needed by cpoll.`\
+  postgresql-server-dev-9.3         `# Needed by cpoll.` \
   xdg-utils                         `# Needed by dlang.`
 
 # Install gcc-4.8 and gcc-4.9

toolset/setup/linux/systools/composer.sh

@@ -11,11 +11,11 @@ fw_depends php
 mkdir -p php-composer
 cd php-composer
 
-fw_get https://getcomposer.org/installer -o composer-installer.php
+fw_get -o composer-installer.php https://getcomposer.org/installer
 
 # Use the PHP and composer from our PHP_HOME directory and 
 # COMPOSER_HOME directories
-${PHP_HOME}/bin/php composer-installer.php --install-dir=${COMPOSER_HOME}
+php composer-installer.php --install-dir=${COMPOSER_HOME}
 
 cd ..
 

toolset/setup/linux/systools/leiningen.sh

@@ -6,7 +6,7 @@ RETCODE=$(fw_exists ${IROOT}/lein.installed)
   return 0; }
 
 mkdir -p lein/bin
-fw_get https://raw.github.com/technomancy/leiningen/stable/bin/lein -o leinbin
+fw_get -o leinbin https://raw.github.com/technomancy/leiningen/stable/bin/lein
 mv leinbin lein/bin/lein
 chmod +x lein/bin/lein
 

toolset/setup/linux/systools/luarocks.sh

@@ -9,7 +9,7 @@ RETCODE=$(fw_exists ${LUAROCKS}.installed)
 
 fw_depends lua
 
-fw_get http://luarocks.org/releases/luarocks-2.2.1.tar.gz
+fw_get -O http://luarocks.org/releases/luarocks-2.2.1.tar.gz
 fw_untar luarocks-2.2.1.tar.gz
 
 cd $LUAROCKS

toolset/setup/linux/systools/sbt.sh

@@ -6,7 +6,7 @@ RETCODE=$(fw_exists ${IROOT}/sbt.installed)
   source $IROOT/sbt.installed
   return 0; }
 
-fw_get http://dl.bintray.com/sbt/native-packages/sbt/$VERSION/sbt-$VERSION.zip -O sbt-$VERSION.zip
+fw_get -o sbt-$VERSION.zip http://dl.bintray.com/sbt/native-packages/sbt/$VERSION/sbt-$VERSION.zip
 fw_unzip sbt-$VERSION.zip
 
 echo -e "export PATH=${IROOT}/sbt/bin:\$PATH" > $IROOT/sbt.installed

toolset/setup/linux/webservers/microhttpd.sh

@@ -9,7 +9,7 @@ RETCODE=$(fw_exists ${MICROHTTPD}.installed)
   source $MICROHTTPD.installed
   return 0; }
 
-fw_get http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-$VERSION.tar.gz
+fw_get -O http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-$VERSION.tar.gz
 fw_untar libmicrohttpd-$VERSION.tar.gz
 cd libmicrohttpd-$VERSION
 ./configure --prefix=$IROOT

toolset/setup/linux/webservers/mongrel2.sh

@@ -14,7 +14,7 @@ sudo apt-get install -y sqlite3 libsqlite3-dev uuid uuid-runtime uuid-dev
 # Update linker cache
 sudo ldconfig -v
 
-fw_get https://github.com/zedshaw/mongrel2/tarball/v1.8.1 -o mongrel2.tar.gz
+fw_get -o mongrel2.tar.gz https://github.com/zedshaw/mongrel2/tarball/v1.8.1
 fw_untar mongrel2.tar.gz
 
 # mongrel2 untars into this folder