Merge pull request #112 from IBM-Cloud/1208

Remove idt and uninstaller. Add ic shortcut for "ibmcloud"

Author: steveclay

README.md

@@ -22,10 +22,9 @@ The following command will install the IBM Cloud Developer Tools in a single inv
 $ curl -sL https://ibm.biz/idt-installer | bash
 ```
 
-Once complete, there will be three shortcuts defined to access the IBM Cloud Developer Tools:
-- `idt` : Main command line tool
-- `idt update` : Update your IBM Cloud Developer Tools to the latest versions
-- `idt uninstall` : Uninstall the IBM Cloud Developer Tools
+Once complete, there will be a shortcut defined to access the IBM Cloud CLI:
+- `ic` : Shortcut for the 'ibmcloud' command
+
 
 Access the [platform-specific readme](./linux-installer/README.md) for additional details.
 

linux-installer/README.md

@@ -37,8 +37,8 @@ $ curl -sL https://ibm.biz/idt-installer | bash
 
 Once complete, there will be three added shortcuts defined to access the IDT:
 - `ibmcloud dev` : Main command line tool for IBM cloud native development
-- `ibmcloud dev update` : Update your IDT environment to the latest versions
-- `ibmcloud dev uninstall` : Uninstall the IBM Developer Tools
+- `ibmcloud update` : Update your IBM Cloud CLI to the latest version
+- `ibmcloud plugin update` : Update IBM Cloud plugins to the latest versions
 
 
 ### Debugging
@@ -49,44 +49,21 @@ If you have any issues with the installer, try running with the `--trace` argume
 curl -sL https://ibm.biz/idt-installer | bash -s -- --trace
 ```
 
-If updating an existing IDT installation, you can run the following:
+If you wish to update the IBM Cloud Dev Plugin, run:
 ```
-idt update --trace
+ibmcloud plugin update dev
 ```
 
 
 ## Updating
 
-If you wish to update the IBM Developer Tools CLI, run `ibmcloud dev update`. There is also a `--force` argument that will force update to all dependencies too.
+If you wish to update the IBM Cloud Dev Plugin, run `ibmcloud plugin update dev`.
 
 Syntax:
 ```
-ibmcloud dev update [--force] [--trace]
+ibmcloud plugin update dev
 ```
 
-This command is simply an alias defined during initial install that runs the installer shown here:
-
-```
-$ curl -sL https://ibm.biz/idt-installer | bash -c -- [--force]
-```
-
-
-## Uninstall
-
-If you wish to remove the IBM Developer Tools CLI, run `ibmcloud dev uninstall`. 
-
-Syntax:
-```
-ibmcloud dev uninstall [--trace]
-```
-
-This command is simply an alias defined during install that runs the following:
-
-```
-$ curl -sL https://ibm.biz/idt-installer | bash -c -- uninstall
-```
-
-
 
 ## Pre-Requisites
 
@@ -103,7 +80,6 @@ Usage: idt-installer [<args>]
 
 Where <args> is:
     install | update    [Default] Perform full install (or update) of all needed CLIs and Plugins
-    uninstall           Uninstall full IBM Cloud CLI env, including 'ibmcloud', and plugins
     help | -h | -?      Show this help
     --force             Force updates of dependencies and other settings during update
     --trace             Eanble verbose tracing of all activity
@@ -114,12 +90,8 @@ If "install" (or no action provided), a full CLI installation (or update) will o
   2. Install latest IBM Cloud 'ibmcloud' CLI
   3. Install all required plugins
   4. Defines aliases to improve useability
-      - idt : Shortcut for normal "ibmcloud dev" command
-      - idt update : Runs this installer checking for and installing any updates
-      - idt uninstall : Uninstalls IDT, including the 'ibmcloud cli' and all plugins
+      - ic : Shortcut for "ibmcloud" command
 
-If "uninstall", the IBM Cloud CLI and plugins are removed from the system, including personal metadata.
-    Note: Pre-req CLIs listed above are NOT uninstalled.
 
 Chat with us on Slack: https://slack-invite-ibm-cloud-tech.mybluemix.net/
 Submit any issues to : https://github.com/IBM-Cloud/ibm-cloud-developer-tools/issues

linux-installer/idt-installer

@@ -25,7 +25,6 @@ function help {
 
   Where <args> is:
     install          [Default] Perform full install (or update) of all needed CLIs and Plugins
-    uninstall        Uninstall full IBM Cloud CLI env, including 'bx', and plugins
     help | -h | -?   Show this help
     --force          Force updates of dependencies and other settings during update
     --trace          Eanble verbose tracing of all activity
@@ -34,10 +33,6 @@ function help {
   1. Pre-req check for 'git', 'docker', 'kubectl', and 'helm'
   2. Install latest IBM Cloud 'bx' CLI
   3. Install all required plugins
-  4. Defines 'idt' shortcut to improve useability.
-      - idt           : Shortcut for normal "bx dev" command
-      - idt update    : Runs this installer checking for and installing any updates
-      - idt uninstall : Uninstalls IDT, 'bx' cli, and all plugins  
 
   Chat with us on Slack: ${SLACK_URL}, channel #developer-tools
   Submit any issues to : ${GIT_URL}/issues
@@ -82,53 +77,9 @@ function prompt {
   #-- Use $REPLY to get user's input
 }
 
-#------------------------------------------------------------------------------
-function uninstall {
-  if [[ -t 0 ]]; then   #-- are we in a terminal?
-    echo
-    prompt "Please confirm you want to uninstall IBM Cloud Developer Tools (y/N)?"
-    if [[ "$REPLY" != [Yy]* ]]; then
-      log "Uninstall aborted at user request"
-      return
-    fi
-  fi
-  warn "Starting Uninstall..."
-  [ "$SUDO" ] && log "You may be prompted for 'sudo' password."
-
-  #-- Run the following regardless
-  $SUDO rm -f  /usr/local/bin/bluemix
-  $SUDO rm -f  /usr/local/bin/bx
-  $SUDO rm -f  /usr/local/bin/bluemix-analytics
-  $SUDO rm -rf /usr/local/Bluemix
-  #-- Taken from bluemix CLI brew uninstaller
-  if [[ -f /etc/profile ]]; then
-    $SUDO sed -E -i ".bluemix_uninstall_bak" \
-                      -e '/^### Added by the Bluemix CLI$/d' \
-                      -e '/^source \/usr\/local\/Bluemix\/bx\/bash_autocomplete$/d' \
-                      /etc/profile
-  fi
-  if [[ -f ~/.bashrc ]]; then
-    sed -E -i ".bluemix_uninstall_bak" \
-                  -e '/^### Added by the Bluemix CLI$/d' \
-                  -e '/^source \/usr\/local\/Bluemix\/bx\/bash_autocomplete$/d' \
-                  ~/.bashrc
-  fi
-  if [[ -f ~/.zshrc ]]; then
-    sed -E -i ".bluemix_uninstall_bak" \
-                  -e '/^### Added by the Bluemix CLI$/d' \
-                  -e '/^source \/usr\/local\/Bluemix\/bx\/zsh_autocomplete$/d' \
-                  ~/.zshrc
-  fi
-  env_setup remove
-
-  rm -rf ~/.bluemix
-
-  log "Uninstall finished."
-}
-
 #------------------------------------------------------------------------------
 function install {
-  if [[ -n "$(which idt)" ]]; then
+  if [[ -n "$(which bx)" ]]; then
     log "Starting Installation..."
   else
     log "Starting Update..."
@@ -372,7 +323,7 @@ function install_plugins {
     "sdk-gen"
   )
 
-  log "Installing/updating IBM Cloud CLI plugins used by IDT..."
+  log "Installing/updating IBM Cloud CLI plugins..."
   for plugin in "${PLUGINS[@]}"; do
     log "Checking status of plugin: ${plugin}"
     read -r p ver <<< "$(bx plugin list | grep "^${plugin} ")"
@@ -391,14 +342,14 @@ function install_plugins {
 
 #------------------------------------------------------------------------------
 function env_setup {
-  idt_prog="/usr/local/bin/idt"
   env_file=""
 
   if   [[ -f ~/.bashrc ]]      ; then env_file=~/.bashrc
   elif [[ -f ~/.bash_profile ]]; then env_file=~/.bash_profile
   elif [[ -f ~/.profile ]]     ; then env_file=~/.profile
   fi
 
+
   #-- Clear up any old aliases
   if [[ -n "$(grep 'alias idt="bx dev"' "$env_file")" ]]; then
     log "Removing old 'idt' aliases from: ${env_file}"
@@ -412,44 +363,10 @@ function env_setup {
     warn "Symptom is: running 'idt update' results in 'update is not a defined command'."
   fi
 
-  if [[ "$1" == "add" ]]; then
-    idt_launch_ver=$(grep "# Version:" /usr/local/bin/idt 2>/dev/null | cut -d':' -f2)
-    if [[ ! -f "$idt_prog" || "$FORCE" == true || "${idt_launch_ver}" != "$VERSION" ]]; then
-      cat <<-!!EOF > ~/idt
-				#!/bin/bash
-				#-----------------------------------------------------------
-				# IBM Cloud Developer Tools (IDT)
-				# Version:${VERSION}
-				# Wrapper for the 'bx dev' command, and external helpers.
-				#-----------------------------------------------------------
-				# Syntax:
-				#   idt                               - Run 'bx dev <args>'
-				#   idt update    [--trace] [--force] - Update IDT and deps
-				#   idt uninstall [--trace]           - Uninstall IDT
-				#-----------------------------------------------------------
-				if [[ "\$1" == "update" || "\$1" == "uninstall" ]]; then
-				  echo "IDT launcher action: \$1"
-				  tmp=\$(mktemp -d 2>/dev/null || mktemp -d -t 'idttmpdir')
-				  echo "Fetching latest installer to: \$tmp/idt-installer"
-				  curl -sL https://ibm.biz/idt-installer -o \$tmp/idt-installer
-				  bash -- \$tmp/idt-installer \$*
-				  rm -r \$tmp
-				else
-				  bx dev \$*
-				fi
-				#-----------------------------------------------------------
-			!!EOF
-      $SUDO mv ~/idt $idt_prog
-      $SUDO chmod 755 $idt_prog
-      log "The following shortcuts defined to access the IBM Cloud Developer Tools CLI:"
-      log "  ${GRN}idt${NRM}           : Main command, shorthand for '${CYN}bx dev${NRM}'"
-      log "  ${GRN}idt update${NRM}    : Update your IBM Cloud Developer Tools to the latest version"
-      log "  ${GRN}idt uninstall${NRM} : Uninstall the IBM Cloud Developer Tools"
-    fi
-  elif [[ "$1" == "remove" ]]; then
-    $SUDO rm -f $idt_prog
-  else
-    error "Internal error - called with invalid parameter: ${1}"
+  if [[ "$1" == "add" && $(grep "alias ic=" $env_file) == "" ]]; then
+    #-- Add alias "ic"
+    echo 'alias ic="ibmcloud"' >> ${env_file}
+    warn "Please restart your shell to enable 'ic' alias for ibmcloud!"
   fi
 }
 
@@ -489,7 +406,6 @@ function main {
       ;;
     "update")     ACTION="install";;
     "install")    ACTION="install";;
-    "uninstall")  ACTION="uninstall";;
     "help")       ACTION="help";;
     esac
     shift
@@ -516,7 +432,6 @@ function main {
   case "$ACTION" in
   "")           install;;
   "install")    install;;
-  "uninstall")  uninstall;;
   *)            help;;
   esac
 

windows-installer/README.md

@@ -15,7 +15,7 @@
 
 ## Summary
 
-PowerShell script that downloads and installs the IBM Cloud Developer Tools (IDT) CLI Plugin and all of its dependencies on Windows 10 or newer systems. The IDT consists of the 'dev' (and several other) plugins to the IBM Cloud CLI. Our general target environment is the IBM Cloud, including public, dedicated, and local hybrid.
+PowerShell script that downloads and installs the IBM Cloud CLI, plugins and all of its dependencies on Windows 10 or newer systems. The CLI consists of the 'dev' (and several other) plugins to the IBM Cloud CLI. Our general target environment is the IBM Cloud, including public, dedicated, and local hybrid.
 
 
 ## Installation
@@ -29,10 +29,8 @@ This action will install (or update) the IBM Cloud Developer Tools to your windo
 Set-ExecutionPolicy Unrestricted; iex(New-Object Net.WebClient).DownloadString('http://ibm.biz/idt-win-installer')
 ```
 
-Once the installation has completed, and you have rebooted your system (as needed), there will be three added shortcuts defined to access the IDT:
-- `ibmcloud dev` : Main command line tool for IBM cloud native development
-- `ibmcloud dev update` : Update your IDT environment to the latest versions
-- `ibmcloud dev uninstall` : Uninstall the IBM Developer Tools
+Once the installation has completed, and you have rebooted your system (as needed), there will be an added shortcut defined to access the IBM Cloud cli:
+- `ic`: shortcut for the `ibmcloud` command
 
 
 ### Running from Download
@@ -56,9 +54,9 @@ Set-ExecutionPolicy Unrestricted
 .\idt-win-installer.ps1 --trace
 ```
 
-If updating an existing IDT installation, you can run the following:
+If updating an existing IBM Cloud CLI installation, you can run the following:
 ```
-ibmcloud dev update --trace
+ibmcloud update
 ```
 
 
@@ -67,31 +65,15 @@ ibmcloud dev update --trace
 If you wish to update the IBM Developer Tools CLI, run:
 
 ```
-ibmcloud dev update [--force] [--trace]
+ibmcloud plugin update dev
 ```
 
-The `--force` argument that will force update to all dependencies too.
-
 This command is simply a shortcut defined during initial install that runs (in admin mode) the installer as shown here:
 
 ```
 PowerShell -NoProfile -ExecutionPolicy Unrestricted -Command "& {Start-Process PowerShell -ArgumentList '-NoProfile -ExecutionPolicy Unrestricted ""iex(New-Object Net.WebClient).DownloadString(""""http://ibm.biz/idt-win-installer"""")"" ""%2"" ""%3"" ' -Verb RunAs}"
 ```
 
-## Uninstall
-
-If you wish to remove the IBM Developer Tools CLI, run:
-
-```
-ibmcloud dev uninstall [--trace]
-```
-
-This command is simply a shortcut defined during install that runs (in admin mode)  the installer's uninstall action as shown here:
-
-```
-PowerShell -NoProfile -ExecutionPolicy Unrestricted -Command "& {Start-Process PowerShell -ArgumentList '-NoProfile -ExecutionPolicy Unrestricted ""iex(New-Object Net.WebClient).DownloadString(""""http://ibm.biz/idt-win-installer"""")"" ""uninstall"" ""%2"" ' -Verb RunAs}"
-```
-
 
 ## Pre-Requisites
 
@@ -108,7 +90,6 @@ Usage: idt-win-installer [<args>]
 
 Where <args> is:
     install | update    [Default] Perform full install (or update) of all needed CLIs and Plugins
-    uninstall           Uninstall full IBM Cloud CLI env, including 'ibmcloud', and plugins
     help | -h | -?      Show this help
     --force             Force updates of dependencies and other settings during update
     --trace             Eanble verbose tracing of all activity
@@ -119,12 +100,8 @@ If "install" (or no action provided), a full CLI installation (or update) will o
   2. Install latest IBM Cloud 'ibmcloud' CLI
   3. Install all required plugins
   4. Defines aliases to improve useability
-      - idt : Shortcut for normal "ibmcloud dev" command
-      - idt update : Runs this installer checking for and installing any updates
-      - idt uninstall : Uninstalls IDT, including the 'ibmcloud cli' and all plugins
+      - ic : Shortcut for "ibmcloud" command
 
-If "uninstall", the IBM Cloud CLI and plugins are removed from the system, including personal metadata.
-    Note: Pre-req CLIs listed above are NOT uninstalled.
 
 Chat with us on Slack: https://slack-invite-ibm-cloud-tech.mybluemix.net/
 Submit any issues to : https://github.com/IBM-Cloud/ibm-cloud-developer-tools/issues