Merges

Author: Karl Bishop

README.md

@@ -52,7 +52,7 @@ To install the IBM Cloud Developer Tools CLI on Windows 10 or newer:
 Set-ExecutionPolicy Unrestricted; iex(New-Object Net.WebClient).DownloadString('http://ibm.biz/idt-win-installer')
 ```
 
-Access the [Widnows-specific readme](./windows-installer/README.md) for additional details.
+Access the [Windows-specific readme](./windows-installer/README.md) for additional details.
 
 
 ## 3rd Party IDE Extensions

linux-installer/README.md

@@ -23,6 +23,12 @@ This script performs an installation of the IBM Developer Tools CLI environment.
 
 
 ## Installation
+Before running the installation script, you should set this environment variable if you plan to deploy to Kubernetes so that the version of Helm that is installed is compatible with the Helm server version.
+
+```
+export DESIRED_VERSION=v2.4.2
+```
+
 To install the IBM Developer Tools CLI, run the following command:
 
 ```
@@ -130,4 +136,4 @@ export IDT_INSTALL_BMX_REPO_NAME="internal"
 export IDT_INSTALL_BMX_REPO_URL="https://plugins.ng.bluemix.net"
 ```
 
-If you need assistance on the proper values, just ask in any of the IBM internal slack channels.
+If you need assistance on the proper values, just ask in any of the IBM internal slack channels.

linux-installer/idt-installer

@@ -7,6 +7,7 @@
 # Copyright (c) 2017, International Business Machines. All Rights Reserved.
 #------------------------------------------------------------------------------
 
+<<<<<<< HEAD
 VERSION="1.1.0"
 PROG="IBM Cloud Developer Tools - Installer"
 INSTALLER_URL="https://ibm.biz/idt-installer"
@@ -190,7 +191,7 @@ function install_deps {
   [[ -z "$(which brew)" ]] && USEBREW=false
 
   # Install curl if not already installed.
-  if ! $(which curl >/dev/null 2&>1); then
+  if ! $(which curl >/dev/null 2>&1); then
     if [ "$PLATFORM" = Linux ]; then
       $SUDO apt-get -y update
       $SUDO apt-get -y install curl

windows-installer/idt-win-installer.ps1

@@ -2,6 +2,13 @@
 # Installs IBM Developer Bluemix CLI plugin and all dependencies.
 # VERSION="0.8"
 
+# Check for Windows 10
+if ([System.Environment]::OSVersion.Version.Major -ne 10)
+{
+    echo "This installer requires Windows 10."
+    exit
+}
+
 # Check for 64-bit Platform - Dev and Helm do not have 32-bit versions.
 if ([Environment]::Is64BitProcess -ne [Environment]::Is64BitOperatingSystem)
 {
@@ -119,4 +126,4 @@ if( $EXT_PLUGINS.contains("sdk-gen")) {
 $restart = Read-Host "A system restart is required. Would you like to restart now (y/n)? (default is n)"
 if($restart -eq "y" -Or $restart -eq "yes") {
     Restart-Computer
-}
+}