Merge pull request #24 from gibfahn/sudo

Make linux installer run as root (without sudo)

Author: Karl Bishop

linux-installer/idt-installer

@@ -14,6 +14,9 @@ GIT_URL="https://github.com/IBM-Bluemix/ibm-cloud-developer-tools"
 SLACK_URL="https://slack-invite-ibm-cloud-tech.mybluemix.net/"
 DEFAULT_BMX_URL="https://clis.ng.bluemix.net/install"
 
+# Only use sudo if not running as root:
+[ "$(id -u)" -ne 0 ] && SUDO=sudo || SUDO=""
+
 if [[ "$IDT_INSTALL_USE_PROD" != false ]]; then
   unset IDT_INSTALL_BMX_URL IDT_INSTALL_BMX_REPO_NAME IDT_INSTALL_BMX_REPO_URL
 fi
@@ -106,14 +109,6 @@ function prompt {
   #-- Use $REPLY to get user's input
 }
 
-function prompt_password {
-  label=${1}
-  echo -en "${label}: ${CYN}" > /dev/tty
-  read -rs    # hide input
-  echo -e "${NRM}"  > /dev/tty
-  #-- Use $REPLY to get user's input
-}
-
 #------------------------------------------------------------------------------
 function uninstall {
   if [[ -t 0 ]]; then   #-- are we in a terminal?
@@ -125,20 +120,20 @@ function uninstall {
     fi
   fi
   warn "Starting Uninstall..."
-  log "You may be prompted for 'sudo' password."
+  [ "$SUDO" ] && log "You may be prompted for 'sudo' password."
 
   log "Removing IBM Cloud 'bx' CLI..."
   if [[ "${PLATFORM}" == "Darwin" && "$USEBREW" == true ]]; then
     brew cask uninstall "bluemix-cli"
   fi
   #-- 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
+  $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" \
+    $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
@@ -165,7 +160,7 @@ function uninstall {
 #------------------------------------------------------------------------------
 function install {
   log "Starting Full Installation..."
-  log "Note: You may be prompted for your 'sudo' password during install."
+  [ "$SUDO" ] && log "Note: You may be prompted for your 'sudo' password during install."
   install_deps
   install_bx
   install_plugins
@@ -194,6 +189,14 @@ function install_deps {
   fi
   [[ -z "$(which brew)" ]] && USEBREW=false
 
+  # Install curl if not already installed.
+  if ! $(which curl >/dev/null 2&>1); then
+    if [ "$PLATFORM" = Linux ]; then
+      $SUDO apt-get -y update
+      $SUDO apt-get -y install curl
+    fi
+  fi
+
   for item in "${EXT_PROGS[@]}"; do
     #-- Parse array item into vars
     IFS="," read -r prog_bin prog_brew prog_url <<< "$item"
@@ -205,23 +208,31 @@ function install_deps {
         log  "You should review any setup requirements for '${prog_bin}' from: ${prog_url}"
       elif [[ "$prog_bin" == "git" ]]; then
         if [[ -n "$(which "apt-get")" ]]; then
-          # Make sure add-apt-repository is installed.
-          sudo apt-get install software-properties-common python-software-properties
           # Get up-to-date git.
-          sudo add-apt-repository -y ppa:git-core/ppa
-          sudo apt-get -y update
-          sudo apt-get -y install git
+          $SUDO apt-get -y update
+
+          # Make sure add-apt-repository is installed.
+          if ! $(which add-apt-repository >/dev/null 2&>1); then
+            $SUDO apt-get install -y software-properties-common python-software-properties
+          fi
+          $SUDO add-apt-repository -y ppa:git-core/ppa
+          $SUDO apt-get -y update
+          $SUDO apt-get -y install git
           log  "Review any setup requirements for '${prog_bin}' from: ${prog_url}"
         else
           warn_unsupported
         fi
       elif [[ "$prog_bin" == "docker" ]]; then
         case $PLATFORM in
          "Linux")
-           curl -fsSL get.docker.com | sudo sh -
-           # Allow docker to run as a non-root user.
-           sudo groupadd docker
-           sudo usermod -aG docker $USER
+           curl -fsSL get.docker.com | $SUDO sh -
+           if [ "$SUDO" ]; then
+             # Allow docker to run as a non-root user (if not running as root).
+             sudo groupadd docker
+             sudo usermod -aG docker $USER
+           else
+             log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"'
+           fi
            log  "Review any setup requirements for '${prog_bin}' from: ${prog_url}"
            ;;
          *)
@@ -242,7 +253,7 @@ function install_deps {
           ;;
         esac
       chmod +x ./kubectl
-        sudo mv ./kubectl /usr/local/bin/kubectl
+        $SUDO mv ./kubectl /usr/local/bin/kubectl
         log  "Review any setup requirements for '${prog_bin}' from: ${prog_url}"
       elif [[ "$prog_bin" == "helm" ]]; then
         curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
@@ -404,7 +415,11 @@ function main {
   "Darwin")
     ;;
   "Linux")
-    warn "Linux has only been tested on Ubuntu, please let us know if you use this utility on other Distros"
+    # Linux distro, e.g "Ubuntu", "RedHatEnterpriseWorkstation", "RedHatEnterpriseServer", "CentOS", "Debian"
+    DISTRO=$(lsb_release -is 2>/dev/null || echo "")
+    if [ "$DISTRO" != Ubuntu ]; then
+      warn "Linux has only been tested on Ubuntu, please let us know if you use this utility on other Distros"
+    fi
     ;;
   *)
     warn_unsupported