Merge pull request #5 from kfbishop/master

Added support for new curl|sh bx installer. Removed all Windows refs

Author: triceam

linux-installer/.gitignore .gitignorelinux-installer/.gitignore renamed to .gitignore

@@ -17,7 +17,7 @@ The following command can install the IBM Developer tools in a single invocation
 $ curl -sL https://ibm.biz/idt-installer | bash
 ```
 
-By default, this installer will use the 'brew' installer, if available. If you do not have `brew` available on your system, execute the following command with `--nobrew` option:
+By default, this installer will use the 'brew' installer on MacOS, if available. If you explicitly do not want to use brew, execute the following command with `--nobrew` option:
 
 ```
 curl -sL https://ibm.biz/idt-installer | bash -s -- --nobrew
@@ -49,4 +49,17 @@ Access the [Widnows-specific readme](./windows-installer/README.md) for addition
 
 ## Feedback
 
-We can be reached on [Slack](https://ibm.biz/IBMCloudNativeSlack) or file an issue on our [GitHub repo](https://github.com/ibm-cloud-tools/idt-installer).
+We can be reached on [Slack](https://ibm.biz/IBMCloudNativeSlack) or file an issue on our [GitHub repo](https://github.com/ibm-cloud-tools/idt-installer).
+
+
+## Internal IBM users
+
+IBM user can utilize this installer pulling the Bluemix cLI and plugins from pre-release internal servers. In order to have the installer utilize internal servers, set the following environment variables (eg in `~/.bashrc`), using the proper actual values:
+
+```
+export IDT_INSTALL_BMX_URL="https://clis.<internal_bluemix_staging_url>/install"
+export IDT_INSTALL_BMX_REPO_NAME="stage"
+export IDT_INSTALL_BMX_REPO_URL="https://plugins.<internal_bluemix_staging_url>"
+```
+
+If you need assistance on the proper values, just ask in any of the internal slack channels.

README.md

@@ -7,11 +7,14 @@
 # Copyright (c) 2017, International Business Machines. All Rights Reserved.
 #------------------------------------------------------------------------------
 
-VERSION="0.6"
+VERSION="0.7"
 PROG="IBM Developer Tools - Installer" 
 INSTALLER_URL="https://ibm.biz/idt-installer"
 GIT_URL="https://github.com/ibm-cloud-tools/idt-installer"
 SLACK_URL="https://ibm.biz/IBMCloudNativeSlack"
+IDT_INSTALL_BMX_URL="${IDT_INSTALL_BMX_URL:=https://clis.ng.bluemix.net/install}"
+IDT_INSTALL_BMX_REPO_NAME="${IDT_INSTALL_BMX_REPO_NAME:=Bluemix}"
+IDT_INSTALL_BMX_REPO_URL="${IDT_INSTALL_BMX_REPO_URL:=https://plugins.ng.bluemix.net}"
 
 #-- External programs, format is "binary, curl, install url"
 EXT_PROGS=(
@@ -172,12 +175,12 @@ function install_deps {
       if [[ "$PLATFORM" == "Darwin" && "$USEBREW" == true ]]; then
         brew install "$prog_brew"
         log  "You should review any setup requirements for '${prog_bin}' from: ${prog_url}"
-      elif [[ "$PLATFORM" != "Windows" && "$prog_bin" == "kubectl" ]]; then
+      elif [[ "$prog_bin" == "kubectl" ]]; then
         curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl
         chmod +x ./kubectl
         sudo mv ./kubectl /usr/local/bin/kubectl
         log  "Review any setup requirements for '${prog_bin}' from: ${prog_url}"
-      elif [[ "$PLATFORM" != "Windows" && "$prog_bin" == "helm" ]]; then
+      elif [[ "$prog_bin" == "helm" ]]; then
         curl -sL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
         log  "Review any setup requirements for '${prog_bin}' from: ${prog_url}"
       else
@@ -195,45 +198,21 @@ function install_deps {
 #------------------------------------------------------------------------------
 function install_bx {
   if [[ -z "$(which bluemix)" ]]; then
-    log "Installing IBM Cloud 'Bluemix' CLI..."
-    log "Finding latest version of Bluemix CLI for platform '${PLATFORM}'..."
-    url="http://public.dhe.ibm.com/cloud/bluemix/cli/bluemix-cli/"
-    #MacOS: Bluemix_CLI_0.4.6.pkg
-    #Linux: Bluemix_CLI_0.4.6_amd64.tar.gz
-    #Win:   Bluemix_CLI_0.4.6_amd64.exe
+    log "Installing IBM Cloud 'Bluemix' CLI for platform '${PLATFORM}'..."
     case "$PLATFORM" in
     "Darwin") 
       if [[ "$USEBREW" == true ]]; then
         brew cask reinstall "caskroom/cask/bluemix-cli"
       else
-        latest=$(curl -s ${url} | grep "Bluemix_CLI_.*\.pkg" | sort | tail -1 | sed  's/^.*\(Bluemix_CLI_.*\.pkg\).*$/\1/')
-        log "Pulling down instance: ${latest}"
-        curl --progress-bar "${url}${latest}" > "${TMPDIR}/${latest}"
-        log "Running installer on: ${latest}"
-        sudo installer -pkg "${TMPDIR}/${latest}" -target /
+        log "Downloading and installing Bluemix CLI from: ${IDT_INSTALL_BMX_URL}/osx"
+        sh <(curl -fsSL ${IDT_INSTALL_BMX_URL}/osx)
       fi
       ;;
     "Linux")  
-      latest=$(curl -s ${url} | grep "Bluemix_CLI_[0-9]\.[0-9]\.[0-9]_amd64.tar.gz" | sort | tail -1 | sed  's/^.*\(Bluemix_CLI_.*_amd64\.tar\.gz\).*$/\1/')
-      log "Pulling down instance: ${latest}"
-      curl --progress-bar "${url}${latest}" > "${TMPDIR}/${latest}"
-      log "Running installer on: ${latest}"
-      cd "${TMPDIR}" || exit
-      tar xvfz "./${latest}"
-      sudo Bluemix_CLI/install_bluemix_cli
-      rm -rf Bluemix_CLI
-      cd - || exit
-      ;;
-    "Windows") 
-      latest=$(curl -s ${url} | grep "Bluemix_CLI_[0-9]\.[0-9]\.[0-9]_amd64.exe" | sort | tail -1 | sed  's/^.*\(Bluemix_CLI_.*_amd64\.exe\).*$/\1/')
-      log "Pulling down instance: ${latest}"
-      curl --progress-bar "${url}${latest}" > "${TMPDIR}/${latest}"
-      log "Calling Windows installer..."
-      "${TMPDIR}/${latest}"
+      log "Downloading and installing Bluemix CLI from: ${IDT_INSTALL_BMX_URL}/linux"
+      sh <(curl -fsSL ${IDT_INSTALL_BMX_URL}/linux)
       ;;
     esac
-    rm -f "${TMPDIR}/${latest}" 2>/dev/null
-
     log "IBM Cloud CLI install finished."
   else #-- Upgrade
     log "Updating exisitng IBM Cloud CLI..."
@@ -246,15 +225,19 @@ function install_bx {
 #------------------------------------------------------------------------------
 function install_plugins {
   log "Installaing / updating required plugins..."
+  if [[ -z "$(bx plugin repos | grep ${IDT_INSTALL_BMX_REPO_NAME})" ]]; then
+    log "Adding repo definition for: ${IDT_INSTALL_BMX_REPO_NAME} >> ${IDT_INSTALL_BMX_REPO_URL}"
+    bx plugin repo-add "${IDT_INSTALL_BMX_REPO_NAME}" "${IDT_INSTALL_BMX_REPO_URL}"
+  fi
   for plugin in "${PLUGINS[@]}"; do
     log "Checking status of plugin: ${plugin}"
     read -r p ver <<< "$(bx plugin list | grep "^${plugin} ")"
     if [[ -z "$p" ]]; then
       log "Installing plugin '$plugin'"
-      bx plugin install -r Bluemix "$plugin"
+      bx plugin install -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin"
     else
       log "Attempting to update plugin '$plugin' from version '$ver'"
-      bx plugin update -r Bluemix "$plugin"
+      bx plugin update -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin"
     fi
   done
   log "Running 'bx plugin list'..."
@@ -350,13 +333,10 @@ function main {
   "Linux")  
     warn "Linux has only been tested on Ubuntu, please let us know if you use this utility on other Distros"
     ;;
-#  "Windows") 
-#    warn "Windows has not been tested AT ALL! Please send all errors to author."
-#    ;;
   *) 
     warn "Only MacOS and Linux systems are supported by this installer."
     warn "For Windows, please follow manual installation instructions at:"
-    warn "https://console.stage1.ng.bluemix.net/docs/cloudnative/dev_cli.html#developercli"
+    warn "https://github.com/IBM-Bluemix/developer-tools-installer"
     error "Unsupported platform: ${PLATFORM}"
     ;;
   esac