From a5dea60ed7e0cb0081bfa866003ca7af3535f946 Mon Sep 17 00:00:00 2001 From: Joe Cooper Date: Tue, 1 Jan 2019 20:12:04 -0600 Subject: [PATCH] Prefer wget over curl to avoid problems on centos --- virtualmin-install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/virtualmin-install.sh b/virtualmin-install.sh index d0ce03a..f74fc76 100644 --- a/virtualmin-install.sh +++ b/virtualmin-install.sh @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck disable=SC2059 disable=SC2181 disable=SC2154 # virtualmin-install.sh -# Copyright 2005-2018 Virtualmin, Inc. +# Copyright 2005-2019 Virtualmin, Inc. # Simple script to grab the virtualmin-release and virtualmin-base packages. # The packages do most of the hard work, so this script can be small-ish and # lazy-ish. @@ -18,7 +18,7 @@ # License and version SERIAL=GPL KEY=GPL -VER=6.0.16 +VER=6.0.17 vm_version=6 # Currently supported systems: @@ -174,12 +174,12 @@ printf "found Perl at $perl\\n" >> $log # Check for wget or curl or fetch printf "Checking for HTTP client..." >> $log while true; do - if [ -x "/usr/bin/curl" ]; then - download="/usr/bin/curl -f -s -L -O" - break - elif [ -x "/usr/bin/wget" ]; then + if [ -x "/usr/bin/wget" ]; then download="/usr/bin/wget -nv" break + elif [ -x "/usr/bin/curl" ]; then + download="/usr/bin/curl -f -s -L -O" + break elif [ -x "/usr/bin/fetch" ]; then download="/usr/bin/fetch" break