Merge remote-tracking branch 'memphinet/no-cert-check' into develop

Conflicts: lib/App/perlbrew.pm
gugod · Jun 7, 2014 · 084c4ad · 084c4ad
2 parents 6537d31 + 3d971cd
commit 084c4ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/App/perlbrew.pm b/lib/App/perlbrew.pm
@@ -111,20 +111,20 @@ sub files_are_the_same {
     my %commands = (
         curl => {
             test     => '--version >/dev/null 2>&1',
-            get      => '--silent --location --fail -o - {url}',
-            download => '--silent --location --fail -o {output} {url}',
+            get      => '--insecure --silent --location --fail -o - {url}',
+            download => '--insecure --silent --location --fail -o {output} {url}',
             order    => 1,
         },
         wget => {
             test     => '--version >/dev/null 2>&1',
-            get      => '--quiet -O - {url}',
-            download => '--quiet -O {output} {url}',
+            get      => '--no-check-certificate --quiet -O - {url}',
+            download => '--no-check-certificate --quiet -O {output} {url}',
             order    => 2,
         },
         fetch => {
             test     => '--version >/dev/null 2>&1',
-            get      => '-o - {url}',
-            download => '{url}',
+            get      => '--no-verify-peer -o - {url}',
+            download => '--no-verify-peer {url}',
             order    => 3,
         }
     );

diff --git a/perlbrew-install b/perlbrew-install
@@ -16,11 +16,11 @@ LOCALINSTALLER="perlbrew-$$"
 
 echo
 if type curl >/dev/null 2>&1; then
-  PERLBREWDOWNLOAD="curl -f -sS -Lo $LOCALINSTALLER $PERLBREWURL"
+  PERLBREWDOWNLOAD="curl -f -k -sS -Lo $LOCALINSTALLER $PERLBREWURL"
 elif type fetch >/dev/null 2>&1; then
-  PERLBREWDOWNLOAD="fetch -o $LOCALINSTALLER $PERLBREWURL"
+  PERLBREWDOWNLOAD="fetch --no-verify-peer -o $LOCALINSTALLER $PERLBREWURL"
 elif type wget >/dev/null 2>&1; then
-  PERLBREWDOWNLOAD="wget -nv -O $LOCALINSTALLER $PERLBREWURL"
+  PERLBREWDOWNLOAD="wget -nv --no-check-certificate -O $LOCALINSTALLER $PERLBREWURL"
 else
   echo "Need wget or curl to use $0"
   exit 1