http to https audit

3 files changed, 9 insertions, 9 deletions

diff --git a/install b/install
index 9475c22..59d854b 100755
--- a/install
+++ b/install
@@ -29,7 +29,7 @@
 #
 # For example:
 #
-# install /tmp/build2-toolchain-0.1.0.tar.gz http://pkg.cppget.org/1/alpha
+# install /tmp/build2-toolchain-0.1.0.tar.gz https://pkg.cppget.org/1/alpha
 #
 usage="usage: $0 [options] <build2-toolchain-archive> <build2-repo>"
 
@@ -110,7 +110,7 @@ cd $tmp
 
 # Download archive if it is an HTTP URL.
 #
-if [[ $tca == http://* ]]; then
+if [[ $tca == http://* || $tca == https://* ]]; then
   url=$tca
   tca=`echo "$url" | sed -e 's%^.*/\(.*\)$%\1%' -`
   if [ -z "$tca" ]; then
@@ -122,7 +122,7 @@ elif [[ $tca != /* ]]; then
   tca=$owd/$tca
 fi
 
-if [[ $rep != http://* && $rep != /* ]]; then
+if [[ ( $rep != http://* || $tca == https://* ) && $rep != /* ]]; then
   rep=$owd/$rep
 fi
 
diff --git a/release.txt b/release.txt
index 7fd26b1..c813817 100644
--- a/release.txt
+++ b/release.txt
@@ -64,8 +64,8 @@ Procession
 - Test production and save a copy of toolchain in etc1/install/X.Y.Z
   
   etc/install -t -i "etc1/install/`cat build2-toolchain/version`" \
-    http://download.build2.org/0.1/build2-toolchain-0.1.0.tar.gz \
-    http://pkg.cppget.org/1/alpha
+    https://download.build2.org/0.1/build2-toolchain-0.1.0.tar.gz \
+    https://pkg.cppget.org/1/alpha
 
 - Upgrade brep on cppget.org (using pkg.cppget.org), verify works
 
diff --git a/test b/test
index 61db258..a09710a 100755
--- a/test
+++ b/test
@@ -54,7 +54,7 @@ for c in g++-4.9 g++-5; do
 --cxx $c \
 --cppflags "-I/usr/include/apache2 -I/usr/include/apr-1.0" \
 $src/build2-toolchain-$tcv.tar.gz \
-http://pkg.cppget1/1/alpha
+https://pkg.cppget1/1/alpha
 done
 
 
@@ -67,7 +67,7 @@ for c in clang++-3.5 clang++-3.6; do
 --cppflags "-I/usr/include/apache2 -I/usr/include/apr-1.0" \
 --cxxflags --stdlib=libc++ \
 $src/build2-toolchain-$tcv.tar.gz \
-http://pkg.cppget1/1/alpha
+https://pkg.cppget1/1/alpha
 done
 fi
 
@@ -75,7 +75,7 @@ fi
 # Test installation requiring sudo.
 #
 etc/install -t -i /opt/build2 -s $src/build2-toolchain-$tcv.tar.gz \
-http://pkg.cppget1/1/alpha
+https://pkg.cppget1/1/alpha
 
 
 # Test on FreeBSD with Clang 3.4 (default) and Clang 3.7.
@@ -86,5 +86,5 @@ for c in clang++ clang++37; do
   ssh freebsd cd /tmp ';' ./install \
 --cxx $c \
 --cppflags '"-I/usr/local/include/apr-1 -I/usr/local/include/apache24"' \
-build2-toolchain-$tcv.tar.gz http://pkg.cppget1/1/alpha
+build2-toolchain-$tcv.tar.gz https://pkg.cppget1/1/alpha
 done