Merge pull request #109 from cloudflare/jwineman/PI-750-update-script…

…-broken PI-750: Fixing cloudflare_upate.sh to be correctly permissioned.
cloudflare · Aug 26, 2016 · b6b2ad7 · b6b2ad7
2 parents 847b870 + aadfdac
commit b6b2ad7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cloudflare.install.sh b/cloudflare.install.sh
@@ -115,10 +115,10 @@ if [ "$LOCAL_FILE_PATH" = "" ]; then
     DOWNLOAD_URL="https://github.com/cloudflare/CloudFlare-CPanel/archive/v$LATEST_VERSION.tar.gz"
 
     if [ "$VERBOSE" = true ]; then
-        echo "curl -skL $DOWNLOAD_URL | tar xfz -"
+        echo "curl -sL $DOWNLOAD_URL | tar xfz -"
     fi
 
-    curl -skL $DOWNLOAD_URL | tar xzf -
+    curl -sL $DOWNLOAD_URL | tar xzf -
 
     # We could check for extract errors here, but the directory check outside
     # the if statement will take care of this

diff --git a/cloudflare_update.sh b/cloudflare_update.sh
@@ -39,7 +39,8 @@ NEW_VERSION=`echo $INSTALLED_VERSION $CURRENT_VERSION | awk '{ print ($1 < $2) ?
 
 if [[ "$NEW_VERSION" == 0 || "$FORCE_INSTALL" == true ]]
     then
-        curl -s -L "https://raw.githubusercontent.com/cloudflare/CloudFlare-CPanel/master/cloudflare.install.sh"
-	    ./cloudflare.install.sh -k $HOST_KEY -n ' '
+        curl -s -L -o ./cloudflare.install.sh "https://raw.githubusercontent.com/cloudflare/CloudFlare-CPanel/master/cloudflare.install.sh"
+        chmod 0700 ./cloudflare.install.sh
+	    bash cloudflare.install.sh -k $HOST_KEY -n ' '
 fi