Browse Source

Removing wget in favor of curl

msmith-techempower 10 years ago
parent
commit
7a8f5afa54

+ 4 - 3
frameworks/Java/vertx/install.sh

@@ -5,7 +5,8 @@ fw_depends java7
 RETCODE=$(fw_exists ${IROOT}/vert.x-2.1.5.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-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
+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
 fw_untar vert.x-2.1.5.tar.gz
-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
-touch ${IROOT}/vert.x-2.1.5.installed
+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
+
+touch $IROOT/vert.x-2.1.5.installed

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

@@ -11,7 +11,7 @@ before_script:
 
 script:
   - phpunit --configuration phpunit.xml --coverage-clover=coverage.clover
-  - wget https://scrutinizer-ci.com/ocular.phar
+  - curl -Os https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 
 notifications:

+ 2 - 2
frameworks/Python/historical/install.sh

@@ -13,6 +13,6 @@ $PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requi
 cd $TROOT/webware 
 rm -fr Webware Webware-1.1.1
 rm 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 downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz -O
+fw_untar Webware-1.1.1.tar.gz
 cp -r app/ Webware-1.1.1/

+ 6 - 2
toolset/setup/linux/bash_functions.sh

@@ -14,8 +14,12 @@ fw_get () {
 
   # -no-verbose disables the big progress bars but keeps
   # other basic info
-  wget --no-verbose --no-check-certificate \
-    --trust-server-names "$@"
+  #wget --no-verbose --no-check-certificate \
+  #  --trust-server-names "$@"
+  # DEPRECATED - older versions of wget use SSLv3 for handshaking
+  # and therefore don't work (Ubuntu12, for instance).
+  # Use curl instead (-s means silent)
+  curl -s "$@"
 
   # Ensure the background job is killed if we are
   kill $!; trap 'kill $!' SIGTERM

+ 6 - 3
toolset/setup/linux/database.sh

@@ -102,7 +102,8 @@ if [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
   sudo apt-get remove -y postgresql postgresql-9.1 postgresql-client-9.1
 
   echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
-  wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  #wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
   sudo apt-get update
   sudo apt-get install -y postgresql-9.3 postgresql-client-9.3
   sudo service postgresql start
@@ -171,7 +172,8 @@ sudo addgroup --system cassandra
 sudo adduser --system --home /ssd/cassandra --no-create-home --ingroup cassandra cassandra
 
 export CASS_V=2.0.12
-wget -nv http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
+#wget -nv http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
+curl -Os http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
 sudo tar xzf apache-cassandra-$CASS_V-bin.tar.gz -C /opt
 sudo ln -s /opt/apache-cassandra-$CASS_V /opt/cassandra
 
@@ -215,7 +217,8 @@ fi
 echo "Setting up Elasticsearch"
 
 export ES_V=1.5.0
-wget -nv https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
+#wget -nv https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
+curl -Os https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_V.tar.gz
 sudo tar zxf elasticsearch-$ES_V.tar.gz -C /opt
 sudo ln -s /opt/elasticsearch-$ES_V /opt/elasticsearch
 

+ 3 - 2
toolset/setup/linux/languages/hhvm.sh

@@ -4,9 +4,10 @@ RETCODE=$(fw_exists ${IROOT}/hhvm.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo add-apt-repository -y ppa:mapnik/v2.2.0
-wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
+#wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
+curl -Os http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
 echo deb http://dl.hhvm.com/ubuntu `lsb_release -sc` main | sudo tee /etc/apt/sources.list.d/hhvm.list
 sudo apt-get update
 sudo apt-get install -y hhvm
 
-touch ${IROOT}/hhvm.installed
+touch $IROOT/hhvm.installed