Merge pull request CrunchyData#280 from jkatz/quickstart-curl

jmccormick2001 · web-flow · commit 72d9da63b58b · 2018-07-18T10:06:29.000-05:00
Add support for curl in the quickstart scripts.
diff --git a/examples/quickstart-for-gke.sh b/examples/quickstart-for-gke.sh
@@ -16,13 +16,22 @@
 LOG="pgo-installer.log"
 
 export PGORELEASE=3.1
+PGO_RELEASE_REMOTE_URL="https://github.com/CrunchyData/postgres-operator/releases/download/$PGORELEASE/postgres-operator.$PGORELEASE.tar.gz"
+PGO_RELEASE_LOCAL_PATH="/tmp/postgres-operator.$PGORELEASE.tar.gz"
 
 echo "Testing for dependencies..." | tee -a $LOG
 
 which wget > /dev/null 2> /dev/null
 if [[ $? -ne 0 ]]; then
-	echo "The required dependency wget is missing on your system." | tee -a $LOG
-	exit 1
+	which curl > /dev/null 2> /dev/null
+	if [[ $? -ne 0 ]]; then
+		echo "The required dependency wget and/or curl is missing on your system." | tee -a $LOG
+		exit 1
+	else
+		PGO_HTTP_CMD="curl -L -s -o ${PGO_RELEASE_LOCAL_PATH} ${PGO_RELEASE_REMOTE_URL}"
+	fi
+else
+	PGO_HTTP_CMD="wget --quiet ${PGO_RELEASE_REMOTE_URL} -O ${PGO_RELEASE_LOCAL_PATH}"
 fi
 which kubectl > /dev/null 2> /dev/null
 if [[ $? -ne 0 ]]; then
@@ -83,11 +92,7 @@ mkdir -p $GOPATH/src/github.com/crunchydata/postgres-operator
 
 echo ""
 echo "Installing pgo server configuration..." | tee -a $LOG
-wget --quiet https://github.com/CrunchyData/postgres-operator/releases/download/$PGORELEASE/postgres-operator.$PGORELEASE.tar.gz -O /tmp/postgres-operator.$PGORELEASE.tar.gz
-if [[ $? -ne 0 ]]; then
-	echo "ERROR: Problem getting the pgo server configuration."
-	exit 1
-fi
+`${PGO_HTTP_CMD}`
 
 cd $COROOT
 tar xzf /tmp/postgres-operator.$PGORELEASE.tar.gz
diff --git a/examples/quickstart-for-ocp.sh b/examples/quickstart-for-ocp.sh
@@ -16,18 +16,22 @@
 LOG="pgo-installer.log"
 
 export PGORELEASE=3.1
+PGO_RELEASE_REMOTE_URL="https://github.com/CrunchyData/postgres-operator/releases/download/$PGORELEASE/postgres-operator.$PGORELEASE.tar.gz"
+PGO_RELEASE_LOCAL_PATH="/tmp/postgres-operator.$PGORELEASE.tar.gz"
 
 echo "Testing for dependencies..." | tee -a $LOG
 
 which wget > /dev/null 2> /dev/null
 if [[ $? -ne 0 ]]; then
-	echo "The required dependency wget is missing on your system." | tee -a $LOG
-	exit 1
-fi
-which oc > /dev/null 2> /dev/null
-if [[ $? -ne 0 ]]; then
-	echo "The required dependency oc is missing on your system." | tee -a $LOG
-	exit 1
+	which curl > /dev/null 2> /dev/null
+	if [[ $? -ne 0 ]]; then
+		echo "The required dependency wget and/or curl is missing on your system." | tee -a $LOG
+		exit 1
+	else
+		PGO_HTTP_CMD="curl -L -s -o ${PGO_RELEASE_LOCAL_PATH} ${PGO_RELEASE_REMOTE_URL}"
+	fi
+else
+	PGO_HTTP_CMD="wget --quiet ${PGO_RELEASE_REMOTE_URL} -O ${PGO_RELEASE_LOCAL_PATH}"
 fi
 
 echo ""
@@ -87,7 +91,7 @@ mkdir -p $GOPATH/src/github.com/crunchydata/postgres-operator
 
 echo ""
 echo "Installing pgo server configuration..." | tee -a $LOG
-wget --quiet https://github.com/CrunchyData/postgres-operator/releases/download/$PGORELEASE/postgres-operator.$PGORELEASE.tar.gz -O /tmp/postgres-operator.$PGORELEASE.tar.gz
+`${PGO_HTTP_CMD}`
 #if [[ $? -ne 0 ]]; then
 #	echo "problem getting pgo server config"
 #	exit 1
