From 2f3f7483b16ef6ed93d3f6883bee29a7ea6b25c6 Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 9 May 2019 09:11:56 +0200 Subject: [PATCH 01/23] Rebased from master --- linux-installer/idt-installer | 57 +++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 3be1dde..2682f7e 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -29,6 +29,8 @@ function help { --force Force updates of dependencies and other settings during update --trace Eanble verbose tracing of all activity + + If "install" (or no action provided), a full CLI installation (or update) will occur: 1. Pre-req check for 'git', 'docker', 'kubectl', and 'helm' 2. Install latest IBM Cloud 'bx' CLI @@ -121,6 +123,8 @@ function install_deps { install_deps_with_apt_get elif [[ "${DISTRO}" == *Red*Hat* || "${DISTRO}" == *CentOS* || "${DISTRO}" == *RHEL* || "${DISTRO}" == *Fedora* ]]; then install_deps_with_yum + elif [[ "${DISTRO}" == *Solus* ]]; then + install_deps_with_eopkg else error "This script has not been updated for use with your linux distribution (${DISTRO})" fi @@ -129,6 +133,55 @@ function install_deps { } +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + #------------------------------------------------------------------------------ function install_darwin_deps { log "Checking for external dependency: brew" @@ -417,8 +470,8 @@ function main { "Linux") # Linux distro, e.g "Ubuntu", "RedHatEnterpriseWorkstation", "RedHatEnterpriseServer", "CentOS", "Debian" DISTRO=$(lsb_release -ds 2>/dev/null || cat /etc/*release 2>/dev/null | head -n1 || uname -om || echo "") - if [[ "$DISTRO" != *Ubuntu* && "$DISTRO" != *Red*Hat* && "$DISTRO" != *CentOS* && "$DISTRO" != *Debian* && "$DISTRO" != *RHEL* && "$DISTRO" != *Fedora* ]]; then - warn "Linux has only been tested on Ubuntu, RedHat, Centos, Debian and Fedora distrubutions please let us know if you use this utility on other Distros" + if [[ "$DISTRO" != *Ubuntu* && "$DISTRO" != *Red*Hat* && "$DISTRO" != *CentOS* && "$DISTRO" != *Debian* && "$DISTRO" != *RHEL* && "$DISTRO" != *Fedora* && "$DISTRO" != *Solus* ]]; then + warn "Linux has only been tested on Ubuntu, RedHat, Centos, Debian, Solus and Fedora distrubutions please let us know if you use this utility on other Distros" fi ;; *) From 0168acf9b7bd434b9c843c69de54d7f57c734862 Mon Sep 17 00:00:00 2001 From: Philip Schmidt Date: Fri, 31 May 2019 14:00:50 -0500 Subject: [PATCH 02/23] force update plugins --- linux-installer/idt-installer | 2 +- windows-installer/idt-win-installer.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 2682f7e..fe96f63 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -382,7 +382,7 @@ function install_plugins { read -r p ver <<< "$(bx plugin list | grep "^${plugin} ")" if [[ -z "$p" ]]; then log "Installing plugin '$plugin'" - bx plugin install -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" + bx plugin install -f -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" else log "Updating plugin '$plugin' from version '$ver'" bx plugin update -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" diff --git a/windows-installer/idt-win-installer.ps1 b/windows-installer/idt-win-installer.ps1 index dd864db..0585b87 100644 --- a/windows-installer/idt-win-installer.ps1 +++ b/windows-installer/idt-win-installer.ps1 @@ -267,7 +267,7 @@ function install_plugins { iex "$bx_command plugin update -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" } else { log "Installing plugin '$plugin'" - iex "$bx_command plugin install -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" + iex "$bx_command plugin install -f -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" } } log "Running 'ibmcloud plugin list'..." From 2456f9de98122ee711d92af794bf1f605d3c3141 Mon Sep 17 00:00:00 2001 From: wbhuberIBM <31781465+wbhuberIBM@users.noreply.github.com> Date: Tue, 18 Jun 2019 11:04:43 -0500 Subject: [PATCH 03/23] Include cloud-object-storage plugin (#125) --- linux-installer/idt-installer | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index fe96f63..5b4630a 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -370,6 +370,7 @@ function install_plugins { #-- BX plugins to process PLUGINS=( "cloud-functions" + "cloud-object-storage" "container-registry" "container-service" "dev" From c00818291e58fa92d0a033af000128cacfeec7fa Mon Sep 17 00:00:00 2001 From: steveclay Date: Mon, 22 Jul 2019 14:38:40 -0500 Subject: [PATCH 04/23] Remove SDK-Gen from installation --- linux-installer/idt-installer | 1 - 1 file changed, 1 deletion(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 5b4630a..fed5ffe 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -374,7 +374,6 @@ function install_plugins { "container-registry" "container-service" "dev" - "sdk-gen" ) log "Installing/updating IBM Cloud CLI plugins..." From 2e938c89a7f0864dfda9be6378db7e6def5de61f Mon Sep 17 00:00:00 2001 From: steveclay Date: Mon, 22 Jul 2019 14:40:26 -0500 Subject: [PATCH 05/23] Remove SDK-Gen from Windows Installer --- windows-installer/idt-win-installer.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/windows-installer/idt-win-installer.ps1 b/windows-installer/idt-win-installer.ps1 index 0585b87..d80a2bb 100644 --- a/windows-installer/idt-win-installer.ps1 +++ b/windows-installer/idt-win-installer.ps1 @@ -249,8 +249,7 @@ function install_plugins { $plugins = "Cloud-Functions", "container-registry", "container-service", - "dev", - "sdk-gen" + "dev" $bx_command = get-command bx -erroraction 'silentlycontinue' if( $bx_command ) { From f090a52da09e58dafc0b5e5aedb572035e8e7864 Mon Sep 17 00:00:00 2001 From: Philip Schmidt Date: Tue, 27 Aug 2019 10:28:18 -0500 Subject: [PATCH 06/23] change cli name from 'bx' to 'ibmcloud' --- windows-installer/idt-win-installer.ps1 | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/windows-installer/idt-win-installer.ps1 b/windows-installer/idt-win-installer.ps1 index d80a2bb..0a277fb 100644 --- a/windows-installer/idt-win-installer.ps1 +++ b/windows-installer/idt-win-installer.ps1 @@ -34,7 +34,7 @@ function help { If "install", "update", or no action, a full CLI installation (or update) will occur: 1. Pre-req check for 'git', 'docker', 'kubectl', and 'helm' - 2. Install latest IBM Cloud 'bx' CLI + 2. Install latest IBM Cloud 'ibmcloud' CLI 3. Install all required plugins Chat with us on Slack: $Global:SLACK_URL, channel #developer-tools @@ -95,13 +95,13 @@ function install() { log "Starting Installation/Update..." #-- Check if internal IBM setup - $bx_command = get-command bx -erroraction 'silentlycontinue' - if( $bx_command ) { + $ibmcloud_command = get-command ibmcloud -erroraction 'silentlycontinue' + if( $ibmcloud_command ) { # The command is set, use it } else { - $bx_command = 'C:\"Program Files"\IBM\Cloud\bin\bx.exe' + $ibmcloud_command = 'C:\"Program Files"\IBM\Cloud\bin\ibmcloud.exe' } - $pluginlist = iex "$bx_command plugin list" + $pluginlist = iex "$ibmcloud_command plugin list" if($pluginlist -match "\bstage\b") { Write-Output $reply = Read-Host -Prompt "Use IBM internal repos for install/updates (Y/n)?" @@ -114,7 +114,7 @@ function install() { } install_deps - install_bx + install_ibmcloud install_plugins env_setup add @@ -213,15 +213,15 @@ function add_to_path { #------------------------------------------------------------------------------ #-- Install IBM Cloud CLI. -function install_bx() { - if( get-command bx -erroraction 'silentlycontinue') { +function install_ibmcloud() { + if( get-command ibmcloud -erroraction 'silentlycontinue') { Write-Output "ibmcloud already installed" if( $Global:FORCE ){ # User wants forced update - bx update -f + ibmcloud update -f } else { # User will be prompted if they want to update - bx update + ibmcloud update } } else { @@ -233,13 +233,13 @@ function install_bx() { $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") } log "IBM Cloud CLI version:" - $bx_command = get-command bx -erroraction 'silentlycontinue' - if( $bx_command ) { + $ibmcloud_command = get-command ibmcloud -erroraction 'silentlycontinue' + if( $ibmcloud_command ) { # The command is set, use it } else { - $bx_command = 'C:\"Program Files"\IBM\Cloud\bin\bx.exe' + $ibmcloud_command = 'C:\"Program Files"\IBM\Cloud\bin\ibmcloud.exe' } - iex "$bx_command --version" + iex "$ibmcloud_command --version" } #------------------------------------------------------------------------------ @@ -251,26 +251,26 @@ function install_plugins { "container-service", "dev" - $bx_command = get-command bx -erroraction 'silentlycontinue' - if( $bx_command ) { + $ibmcloud_command = get-command ibmcloud -erroraction 'silentlycontinue' + if( $ibmcloud_command ) { # The command is set, use it } else { - $bx_command = 'C:\"Program Files"\IBM\Cloud\bin\bx.exe' + $ibmcloud_command = 'C:\"Program Files"\IBM\Cloud\bin\ibmcloud.exe' } - $pluginlist = iex "$bx_command plugin list" + $pluginlist = iex "$ibmcloud_command plugin list" Foreach ($plugin in $plugins) { log "Checking status of plugin: $plugin" if($pluginlist -match "\b$plugin\b") { log "Updating plugin '$plugin'" - iex "$bx_command plugin update -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" + iex "$ibmcloud_command plugin update -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" } else { log "Installing plugin '$plugin'" - iex "$bx_command plugin install -f -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" + iex "$ibmcloud_command plugin install -f -r $Global:IDT_INSTALL_BMX_REPO_NAME $plugin" } } log "Running 'ibmcloud plugin list'..." - iex "$bx_command plugin list" + iex "$ibmcloud_command plugin list" log "Finished installing/updating plugins" } From d2b49e1e0bbc4369a5c7025498c5513f9e043916 Mon Sep 17 00:00:00 2001 From: Philip Schmidt Date: Tue, 27 Aug 2019 10:29:43 -0500 Subject: [PATCH 07/23] change cli name from 'bx' to 'ibmcloud' for linux installer --- linux-installer/idt-installer | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index fed5ffe..8641d98 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -33,7 +33,7 @@ function help { If "install" (or no action provided), a full CLI installation (or update) will occur: 1. Pre-req check for 'git', 'docker', 'kubectl', and 'helm' - 2. Install latest IBM Cloud 'bx' CLI + 2. Install latest IBM Cloud 'ibmcloud' CLI 3. Install all required plugins Chat with us on Slack: ${SLACK_URL}, channel #developer-tools @@ -81,15 +81,15 @@ function prompt { #------------------------------------------------------------------------------ function install { - if [[ -n "$(which bx)" ]]; then + if [[ -n "$(which ibmcloud)" ]]; then log "Starting Installation..." else log "Starting Update..." fi #-- Check if internal IBM setup - if [[ -n "$(which bx)" ]]; then - read -r repo url <<< $(bx plugin repos | grep stage1) + if [[ -n "$(which ibmcloud)" ]]; then + read -r repo url <<< $(ibmcloud plugin repos | grep stage1) if [[ -n "$repo" ]]; then echo prompt "Use IBM internal '$repo' repos for install/updates (Y/n)?" @@ -104,7 +104,7 @@ function install { [ "$SUDO" ] && log "Note: You may be prompted for your 'sudo' password during install." install_deps - install_bx + install_ibmcloud install_plugins env_setup add @@ -339,35 +339,35 @@ function install_docker { } #------------------------------------------------------------------------------ -function install_bx { - if [[ -z "$(which bx)" ]]; then - log "Installing IBM Cloud 'bx' CLI for platform '${PLATFORM}'..." +function install_ibmcloud { + if [[ -z "$(which ibmcloud)" ]]; then + log "Installing IBM Cloud 'ibmcloud' CLI for platform '${PLATFORM}'..." case "$PLATFORM" in "Darwin") - log "Downloading and installing IBM Cloud 'bx' CLI from: ${IDT_INSTALL_BMX_URL}/osx" + log "Downloading and installing IBM Cloud 'ibmcloud' CLI from: ${IDT_INSTALL_BMX_URL}/osx" sh <(curl -fsSL ${IDT_INSTALL_BMX_URL}/osx) ;; "Linux") - log "Downloading and installing IBM Cloud 'bx' CLI from: ${IDT_INSTALL_BMX_URL}/linux" + log "Downloading and installing IBM Cloud 'ibmcloud' CLI from: ${IDT_INSTALL_BMX_URL}/linux" sh <(curl -fsSL ${IDT_INSTALL_BMX_URL}/linux) ;; esac - log "IBM Cloud 'bx' CLI install finished." + log "IBM Cloud 'ibmcloud' CLI install finished." else #-- Upgrade - log "Updating existing IBM Cloud 'bx' CLI..." + log "Updating existing IBM Cloud 'ibmcloud' CLI..." if [[ "$FORCE" == true ]]; then - bx update -f + ibmcloud update -f else - bx update + ibmcloud update fi fi - log "Running 'bx --version'..." - bx --version + log "Running 'ibmcloud --version'..." + ibmcloud --version } #------------------------------------------------------------------------------ function install_plugins { - #-- BX plugins to process + #-- ibmcloud plugins to process PLUGINS=( "cloud-functions" "cloud-object-storage" @@ -379,17 +379,17 @@ function install_plugins { 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} ")" + read -r p ver <<< "$(ibmcloud plugin list | grep "^${plugin} ")" if [[ -z "$p" ]]; then log "Installing plugin '$plugin'" - bx plugin install -f -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" + ibmcloud plugin install -f -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" else log "Updating plugin '$plugin' from version '$ver'" - bx plugin update -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" + ibmcloud plugin update -r "${IDT_INSTALL_BMX_REPO_NAME}" "$plugin" fi done - log "Running 'bx plugin list'..." - bx plugin list + log "Running 'ibmcloud plugin list'..." + ibmcloud plugin list log "Finished installing/updating plugins" } @@ -404,11 +404,11 @@ function env_setup { #-- Clear up any old aliases - if [[ -n "$(grep 'alias idt="bx dev"' "$env_file")" ]]; then + if [[ -n "$(grep 'alias idt="ibmcloud dev"' "$env_file")" ]]; then log "Removing old 'idt' aliases from: ${env_file}" sed -E -i ".idt_uninstall_bak" \ -e '/^#-- Added by the IDT Installer$/d' \ - -e '/^alias idt=\"bx dev\"$/d' \ + -e '/^alias idt=\"ibmcloud dev\"$/d' \ -e '/^alias idt-update=/d' \ -e '/^alias idt-uninstall=/d' \ ${env_file} From 70eeaf435cc7dbd2c83a85dc3ac57e9ead6fecf4 Mon Sep 17 00:00:00 2001 From: steveclay Date: Fri, 6 Dec 2019 14:01:53 -0600 Subject: [PATCH 08/23] Change to use cloud.ibm.com for CLI installer --- linux-installer/idt-installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 8641d98..c097f54 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -12,9 +12,9 @@ PROG="IBM Cloud Developer Tools for Linux/MacOS - Installer" INSTALLER_URL="https://ibm.biz/idt-installer" GIT_URL="https://github.com/IBM-Cloud/ibm-cloud-developer-tools" SLACK_URL="https://slack-invite-ibm-cloud-tech.mybluemix.net/" -IDT_INSTALL_BMX_URL="https://clis.ng.bluemix.net/install" +IDT_INSTALL_BMX_URL="https://clis.cloud.ibm.com/install" IDT_INSTALL_BMX_REPO_NAME="Bluemix" -IDT_INSTALL_BMX_REPO_URL="https://plugins.ng.bluemix.net" +IDT_INSTALL_BMX_REPO_URL="https://plugins.cloud.ibm.com" #------------------------------------------------------------------------------ function help { From c844f285d0d74c745af6f1568409fe2dc897a360 Mon Sep 17 00:00:00 2001 From: steveclay Date: Mon, 6 Jan 2020 10:53:13 -0600 Subject: [PATCH 09/23] Fix Windows Git file download version to 2 --- windows-installer/idt-win-installer.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows-installer/idt-win-installer.ps1 b/windows-installer/idt-win-installer.ps1 index 0a277fb..7aa340d 100644 --- a/windows-installer/idt-win-installer.ps1 +++ b/windows-installer/idt-win-installer.ps1 @@ -135,7 +135,7 @@ function install_deps() { log "Installing/updating external dependency: git" $gitVersion = (Invoke-WebRequest "https://git-scm.com/downloads/latest" -UseBasicParsing).Content - Invoke-WebRequest "https://github.com/git-for-windows/git/releases/download/v$gitVersion.windows.1/Git-$gitVersion-64-bit.exe" -UseBasicParsing -outfile "git-installer.exe" + Invoke-WebRequest "https://github.com/git-for-windows/git/releases/download/v$gitVersion.windows.2/Git-$gitVersion-64-bit.exe" -UseBasicParsing -outfile "git-installer.exe" .\git-installer.exe /SILENT /PathOption="Cmd" | Out-Null Remove-Item "git-installer.exe" $Global:NEEDS_REBOOT = $true From 4b1b7062f6313d8f114951b97d45332d94e71aae Mon Sep 17 00:00:00 2001 From: steveclay Date: Fri, 6 Dec 2019 14:22:56 -0600 Subject: [PATCH 10/23] Change to use cloud.ibm.com for CLI installer for Windows --- windows-installer/idt-win-installer.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows-installer/idt-win-installer.ps1 b/windows-installer/idt-win-installer.ps1 index 7aa340d..42a255f 100644 --- a/windows-installer/idt-win-installer.ps1 +++ b/windows-installer/idt-win-installer.ps1 @@ -11,9 +11,9 @@ $Global:PROG="IBM Cloud Developer Tools - Installer for Windows" $Global:INSTALLER_URL="https://ibm.biz/idt-win-installer" $Global:GIT_URL="https://github.com/IBM-Cloud/ibm-cloud-developer-tools" $Global:SLACK_URL="https://slack-invite-ibm-cloud-tech.mybluemix.net/" -$Global:IDT_INSTALL_BMX_URL="https://clis.ng.bluemix.net/install" +$Global:IDT_INSTALL_BMX_URL="https://clis.cloud.ibm.com/install" $Global:IDT_INSTALL_BMX_REPO_NAME="Bluemix" -$Global:IDT_INSTALL_BMX_REPO_URL="https://plugins.ng.bluemix.net" +$Global:IDT_INSTALL_BMX_REPO_URL="https://plugins.cloud.ibm.com" $Global:FORCE = $false $Global:NEEDS_REBOOT = $false From 8f99b3e487b79f93f9e479ecf1450777b85e180e Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 11/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index c097f54..6fb1717 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -279,6 +279,55 @@ function install_deps_with_apt_get { fi } +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + logrevert "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + #------------------------------------------------------------------------------ function install_deps_with_yum { log "Checking for and updating 'yum' support on Linux" From 707d895403c451c7ae5aa73f17a82ce58cab383f Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 12/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 185 +++++++++++++++++----------------- 1 file changed, 94 insertions(+), 91 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 6fb1717..cf1083f 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,107 +233,110 @@ function install_darwin_deps { fi } -#------------------------------------------------------------------------------ -function install_deps_with_apt_get { - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. That's the only Debian/Ubuntu linux installer I know, sorry." - fi - if [[ -z "$(which add-apt-repository)" ]]; 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 - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi - - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi + "Linux") + case "$DISTRO" in + "Ubuntu") + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. Thats the only linux installer I know, sorry." + fi + if [[ -z "$(which add-apt-repository)" ]]; 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 - #-- Docker: - install_docker + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - local kube_version=$(get_kubectl_version) - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + 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 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi -#------------------------------------------------------------------------------ -function install_deps_with_eopkg { - logrevert "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi + "Solus") + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi -#------------------------------------------------------------------------------ -function install_deps_with_yum { - log "Checking for and updating 'yum' support on Linux" - if [[ -z "$(which yum)" ]]; then - error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." - fi + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + esac #-- CURL: log "Installing/updating external dependency: curl" From e2ac68496414af4332e023523659f215d666d9f0 Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 5 Mar 2020 10:22:21 +0100 Subject: [PATCH 13/23] rebased from upstream/master --- linux-installer/idt-installer | 138 ---------------------------------- 1 file changed, 138 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index cf1083f..61280db 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,144 +233,6 @@ function install_darwin_deps { fi } - "Linux") - case "$DISTRO" in - "Ubuntu") - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. Thats the only linux installer I know, sorry." - fi - if [[ -z "$(which add-apt-repository)" ]]; 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 - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - 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 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - - "Solus") - log "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - esac - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO yum -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO yum install -y git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - install_docker - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO sh -c 'printf "[kubernetes]\nname=Kubernetes\nbaseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\n" > /etc/yum.repos.d/kubernetes.repo' - local kube_version=$(get_kubectl_version) - local kube_yum_version=$(yum --showduplicates list kubectl -y | grep -Eo "($kube_version\-[0-9*])") - $SUDO yum install -y kubectl-$kube_yum_version - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} - #------------------------------------------------------------------------------ function install_docker { From 8acce817b8bc7703108b1d8a8a0682d5245161eb Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 14/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 61280db..81cb26f 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -234,6 +234,144 @@ function install_darwin_deps { } #------------------------------------------------------------------------------ +<<<<<<< HEAD +======= +function install_deps_with_apt_get { + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. That's the only Debian/Ubuntu linux installer I know, sorry." + fi + if [[ -z "$(which add-apt-repository)" ]]; 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 + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + install_docker + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + local kube_version=$(get_kubectl_version) + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + logrevert "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +function install_deps_with_yum { + log "Checking for and updating 'yum' support on Linux" + if [[ -z "$(which yum)" ]]; then + error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." + fi + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO yum -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO yum install -y git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + install_docker + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO sh -c 'printf "[kubernetes]\nname=Kubernetes\nbaseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\n" > /etc/yum.repos.d/kubernetes.repo' + local kube_version=$(get_kubectl_version) + local kube_yum_version=$(yum --showduplicates list kubectl -y | grep -Eo "($kube_version\-[0-9*])") + $SUDO yum install -y kubectl-$kube_yum_version + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +>>>>>>> Added support for Solus. function install_docker { #-- Docker: From 2ca268038253c4783afe8f939afff5d9b4fe5494 Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 15/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 110 +++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 81cb26f..d38025d 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,6 +233,7 @@ function install_darwin_deps { fi } +<<<<<<< HEAD #------------------------------------------------------------------------------ <<<<<<< HEAD ======= @@ -311,10 +312,48 @@ function install_deps_with_eopkg { sudo usermod -aG docker $USER 2>/dev/null else log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' +======= + "Linux") + case "$DISTRO" in + "Ubuntu") + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. Thats the only linux installer I know, sorry." + fi + if [[ -z "$(which add-apt-repository)" ]]; 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 + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + 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 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" +>>>>>>> Added support for Solus. fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi +<<<<<<< HEAD #-- kubectl: log "Installing/updating external dependency: kubectl" if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then @@ -336,6 +375,73 @@ function install_deps_with_yum { if [[ -z "$(which yum)" ]]; then error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." fi +======= + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + + "Solus") + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + esac +>>>>>>> Added support for Solus. #-- CURL: log "Installing/updating external dependency: curl" From 84cf3aa906563391570d162ebe7113b645bece92 Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 5 Mar 2020 10:36:50 +0100 Subject: [PATCH 16/23] rebased from upstream/master --- linux-installer/idt-installer | 124 +--------------------------------- 1 file changed, 2 insertions(+), 122 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index d38025d..57952c5 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,10 +233,7 @@ function install_darwin_deps { fi } -<<<<<<< HEAD #------------------------------------------------------------------------------ -<<<<<<< HEAD -======= function install_deps_with_apt_get { log "Checking for and updating 'apt-get' support on Linux" if [[ -z "$(which apt-get)" ]]; then @@ -284,7 +281,7 @@ function install_deps_with_apt_get { #------------------------------------------------------------------------------ function install_deps_with_eopkg { - logrevert "Checking for and updating 'eopkg' support on Linux" + log "Checking for and updating 'eopkg' support on Linux" if [[ -z "$(which eopkg)" ]]; then error "'eopkg' is not found. Thats the only linux installer I know, sorry." fi @@ -303,57 +300,8 @@ function install_deps_with_eopkg { fi #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' -======= - "Linux") - case "$DISTRO" in - "Ubuntu") - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. Thats the only linux installer I know, sorry." - fi - if [[ -z "$(which add-apt-repository)" ]]; 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 - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - 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 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" ->>>>>>> Added support for Solus. - fi + install_docker -<<<<<<< HEAD #-- kubectl: log "Installing/updating external dependency: kubectl" if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then @@ -375,73 +323,6 @@ function install_deps_with_yum { if [[ -z "$(which yum)" ]]; then error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." fi -======= - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - - "Solus") - log "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - esac ->>>>>>> Added support for Solus. #-- CURL: log "Installing/updating external dependency: curl" @@ -477,7 +358,6 @@ function install_deps_with_yum { } #------------------------------------------------------------------------------ ->>>>>>> Added support for Solus. function install_docker { #-- Docker: From 9a3e3a2d2d9af77f98214d31ee2fea03069760c8 Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 9 May 2019 09:11:56 +0200 Subject: [PATCH 17/23] Rebased from master --- linux-installer/idt-installer | 57 +++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index bcad5ce..9f29bdb 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -29,6 +29,8 @@ function help { --force Force updates of dependencies and other settings during update --trace Eanble verbose tracing of all activity + + If "install" (or no action provided), a full CLI installation (or update) will occur: 1. Pre-req check for 'git', 'docker', 'kubectl', and 'helm' 2. Install latest IBM Cloud 'ibmcloud' CLI @@ -121,6 +123,8 @@ function install_deps { install_deps_with_apt_get elif [[ "${DISTRO}" == *Red*Hat* || "${DISTRO}" == *CentOS* || "${DISTRO}" == *RHEL* || "${DISTRO}" == *Fedora* ]]; then install_deps_with_yum + elif [[ "${DISTRO}" == *Solus* ]]; then + install_deps_with_eopkg else error "This script has not been updated for use with your linux distribution (${DISTRO})" fi @@ -129,6 +133,55 @@ function install_deps { } +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + #------------------------------------------------------------------------------ function install_darwin_deps { log "Checking for external dependency: brew" @@ -424,8 +477,8 @@ function main { "Linux") # Linux distro, e.g "Ubuntu", "RedHatEnterpriseWorkstation", "RedHatEnterpriseServer", "CentOS", "Debian" DISTRO=$(lsb_release -ds 2>/dev/null || cat /etc/*release 2>/dev/null | head -n1 || uname -om || echo "") - if [[ "$DISTRO" != *Ubuntu* && "$DISTRO" != *Red*Hat* && "$DISTRO" != *CentOS* && "$DISTRO" != *Debian* && "$DISTRO" != *RHEL* && "$DISTRO" != *Fedora* ]]; then - warn "Linux has only been tested on Ubuntu, RedHat, Centos, Debian and Fedora distrubutions please let us know if you use this utility on other Distros" + if [[ "$DISTRO" != *Ubuntu* && "$DISTRO" != *Red*Hat* && "$DISTRO" != *CentOS* && "$DISTRO" != *Debian* && "$DISTRO" != *RHEL* && "$DISTRO" != *Fedora* && "$DISTRO" != *Solus* ]]; then + warn "Linux has only been tested on Ubuntu, RedHat, Centos, Debian, Solus and Fedora distrubutions please let us know if you use this utility on other Distros" fi ;; *) From 19fe621d99883109a6ff1c94c07870da1a0c3cfe Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 18/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 9f29bdb..c2e2528 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -287,6 +287,55 @@ function install_deps_with_apt_get { fi } +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + logrevert "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + #------------------------------------------------------------------------------ function install_deps_with_yum { log "Checking for and updating 'yum' support on Linux" From 37fafa5aeb92013b36f6ea3e2e1c54927bb3103b Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 19/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 189 +++++++++++++++++----------------- 1 file changed, 92 insertions(+), 97 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index c2e2528..2c56278 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,115 +233,110 @@ function install_darwin_deps { fi } -#------------------------------------------------------------------------------ -function install_deps_with_apt_get { - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. That's the only Debian/Ubuntu linux installer I know, sorry." - fi - $SUDO apt-get -y -qq update > /dev/null - if [[ -z "$(which add-apt-repository)" ]]; then - if [ "$(apt-cache search software-properties-common | wc -l)" != "0" ]; then - log "Installing package: software-properties-common" - $SUDO apt-get install -yqq software-properties-common > /dev/null 2>&1 + "Linux") + case "$DISTRO" in + "Ubuntu") + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. Thats the only linux installer I know, sorry." fi - if [ "$(apt-cache search python-software-properties | wc -l)" != "0" ]; then - log "Installing package: python-software-properties" - $SUDO apt-get install -yqq python-software-properties > /dev/null 2>&1 + if [[ -z "$(which add-apt-repository)" ]]; then + $SUDO apt-get install -y software-properties-common python-software-properties fi - fi - $SUDO add-apt-repository -y ppa:git-core/ppa - $SUDO apt-get -y update - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi + $SUDO add-apt-repository -y ppa:git-core/ppa + $SUDO apt-get -y update - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - install_docker + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - local kube_version=$(get_kubectl_version) - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + 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 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi -#------------------------------------------------------------------------------ -function install_deps_with_eopkg { - logrevert "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi + "Solus") + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi -#------------------------------------------------------------------------------ -function install_deps_with_yum { - log "Checking for and updating 'yum' support on Linux" - if [[ -z "$(which yum)" ]]; then - error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." - fi + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + esac #-- CURL: log "Installing/updating external dependency: curl" From 5282807d942f5b81496cf7564780f1fb98332521 Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 5 Mar 2020 10:22:21 +0100 Subject: [PATCH 20/23] rebased from upstream/master --- linux-installer/idt-installer | 138 ---------------------------------- 1 file changed, 138 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 2c56278..280c222 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,144 +233,6 @@ function install_darwin_deps { fi } - "Linux") - case "$DISTRO" in - "Ubuntu") - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. Thats the only linux installer I know, sorry." - fi - if [[ -z "$(which add-apt-repository)" ]]; 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 - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - 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 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - - "Solus") - log "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - esac - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO yum -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO yum install -y git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - install_docker - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO sh -c 'printf "[kubernetes]\nname=Kubernetes\nbaseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\n" > /etc/yum.repos.d/kubernetes.repo' - local kube_version=$(get_kubectl_version) - local kube_yum_version=$(yum --showduplicates list kubectl -y | grep -Eo "($kube_version\-[0-9*])") - $SUDO yum install -y kubectl-$kube_yum_version - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi -} - #------------------------------------------------------------------------------ function install_docker { From e02c059e352ced02521bcc42d5d3c5c0e84b5fe2 Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 21/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 280c222..aa2bbaa 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -234,6 +234,144 @@ function install_darwin_deps { } #------------------------------------------------------------------------------ +<<<<<<< HEAD +======= +function install_deps_with_apt_get { + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. That's the only Debian/Ubuntu linux installer I know, sorry." + fi + if [[ -z "$(which add-apt-repository)" ]]; 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 + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + install_docker + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + local kube_version=$(get_kubectl_version) + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +function install_deps_with_eopkg { + logrevert "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +function install_deps_with_yum { + log "Checking for and updating 'yum' support on Linux" + if [[ -z "$(which yum)" ]]; then + error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." + fi + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO yum -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO yum install -y git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + install_docker + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO sh -c 'printf "[kubernetes]\nname=Kubernetes\nbaseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\n" > /etc/yum.repos.d/kubernetes.repo' + local kube_version=$(get_kubectl_version) + local kube_yum_version=$(yum --showduplicates list kubectl -y | grep -Eo "($kube_version\-[0-9*])") + $SUDO yum install -y kubectl-$kube_yum_version + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi +} + +#------------------------------------------------------------------------------ +>>>>>>> Added support for Solus. function install_docker { #-- Docker: From d695398113f345056f11613dcb2ace22ef8ff21e Mon Sep 17 00:00:00 2001 From: Patrik Pettersson <991050+mebur@users.noreply.github.com> Date: Wed, 28 Nov 2018 14:16:54 +0100 Subject: [PATCH 22/23] Added support for Solus. I've been using Solus as my daily driver for about 3 years now and I'd like this to be automated =) https://getsol.us/home/ --- linux-installer/idt-installer | 110 +++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index aa2bbaa..613aa75 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,6 +233,7 @@ function install_darwin_deps { fi } +<<<<<<< HEAD #------------------------------------------------------------------------------ <<<<<<< HEAD ======= @@ -311,10 +312,48 @@ function install_deps_with_eopkg { sudo usermod -aG docker $USER 2>/dev/null else log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' +======= + "Linux") + case "$DISTRO" in + "Ubuntu") + log "Checking for and updating 'apt-get' support on Linux" + if [[ -z "$(which apt-get)" ]]; then + error "'apt-get' is not found. Thats the only linux installer I know, sorry." + fi + if [[ -z "$(which add-apt-repository)" ]]; 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 + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO apt-get -y install git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + 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 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" +>>>>>>> Added support for Solus. fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi +<<<<<<< HEAD #-- kubectl: log "Installing/updating external dependency: kubectl" if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then @@ -336,6 +375,73 @@ function install_deps_with_yum { if [[ -z "$(which yum)" ]]; then error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." fi +======= + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl + $SUDO mv ./kubectl /usr/local/bin/kubectl + $SUDO chmod +x /usr/local/bin/kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + + "Solus") + log "Checking for and updating 'eopkg' support on Linux" + if [[ -z "$(which eopkg)" ]]; then + error "'eopkg' is not found. Thats the only linux installer I know, sorry." + fi + $SUDO eopkg ur Solus + + #-- CURL: + log "Installing/updating external dependency: curl" + if [[ -z "$(which curl)" || "$FORCE" == true ]]; then + $SUDO eopkg it curl + fi + #-- GIT: + log "Installing/updating external dependency: git" + if [[ -z "$(which git)" || "$FORCE" == true ]]; then + $SUDO eopkg it git + log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" + fi + + #-- Docker: + log "Installing/updating external dependency: docker" + if [[ -z "$(which docker)" || "$FORCE" == true ]]; then + $SUDO eopkg it docker + if [ "$SUDO" ]; then + # Allow docker to run as a non-root user (if not running as root). + sudo groupadd docker 2>/dev/null + sudo usermod -aG docker $USER 2>/dev/null + else + log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' + fi + log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" + fi + + #-- kubectl: + log "Installing/updating external dependency: kubectl" + if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then + $SUDO eopkg it kubectl + log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" + fi + + #-- helm: + log "Installing/updating external dependency: helm" + if [[ -z "$(which helm)" || "$FORCE" == true ]]; then + curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash + log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" + fi + ;; + esac +>>>>>>> Added support for Solus. #-- CURL: log "Installing/updating external dependency: curl" From 4f1a479ba49d3d3118ff2a32741089fb97dcf39a Mon Sep 17 00:00:00 2001 From: patrik Date: Thu, 5 Mar 2020 10:36:50 +0100 Subject: [PATCH 23/23] rebased from upstream/master --- linux-installer/idt-installer | 124 +--------------------------------- 1 file changed, 2 insertions(+), 122 deletions(-) diff --git a/linux-installer/idt-installer b/linux-installer/idt-installer index 613aa75..8d9fbb9 100755 --- a/linux-installer/idt-installer +++ b/linux-installer/idt-installer @@ -233,10 +233,7 @@ function install_darwin_deps { fi } -<<<<<<< HEAD #------------------------------------------------------------------------------ -<<<<<<< HEAD -======= function install_deps_with_apt_get { log "Checking for and updating 'apt-get' support on Linux" if [[ -z "$(which apt-get)" ]]; then @@ -284,7 +281,7 @@ function install_deps_with_apt_get { #------------------------------------------------------------------------------ function install_deps_with_eopkg { - logrevert "Checking for and updating 'eopkg' support on Linux" + log "Checking for and updating 'eopkg' support on Linux" if [[ -z "$(which eopkg)" ]]; then error "'eopkg' is not found. Thats the only linux installer I know, sorry." fi @@ -303,57 +300,8 @@ function install_deps_with_eopkg { fi #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' -======= - "Linux") - case "$DISTRO" in - "Ubuntu") - log "Checking for and updating 'apt-get' support on Linux" - if [[ -z "$(which apt-get)" ]]; then - error "'apt-get' is not found. Thats the only linux installer I know, sorry." - fi - if [[ -z "$(which add-apt-repository)" ]]; 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 - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO apt-get -y install git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - 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 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" ->>>>>>> Added support for Solus. - fi + install_docker -<<<<<<< HEAD #-- kubectl: log "Installing/updating external dependency: kubectl" if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then @@ -375,73 +323,6 @@ function install_deps_with_yum { if [[ -z "$(which yum)" ]]; then error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry." fi -======= - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl - $SUDO mv ./kubectl /usr/local/bin/kubectl - $SUDO chmod +x /usr/local/bin/kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - - "Solus") - log "Checking for and updating 'eopkg' support on Linux" - if [[ -z "$(which eopkg)" ]]; then - error "'eopkg' is not found. Thats the only linux installer I know, sorry." - fi - $SUDO eopkg ur Solus - - #-- CURL: - log "Installing/updating external dependency: curl" - if [[ -z "$(which curl)" || "$FORCE" == true ]]; then - $SUDO eopkg it curl - fi - #-- GIT: - log "Installing/updating external dependency: git" - if [[ -z "$(which git)" || "$FORCE" == true ]]; then - $SUDO eopkg it git - log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads" - fi - - #-- Docker: - log "Installing/updating external dependency: docker" - if [[ -z "$(which docker)" || "$FORCE" == true ]]; then - $SUDO eopkg it docker - if [ "$SUDO" ]; then - # Allow docker to run as a non-root user (if not running as root). - sudo groupadd docker 2>/dev/null - sudo usermod -aG docker $USER 2>/dev/null - else - log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"' - fi - log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/" - fi - - #-- kubectl: - log "Installing/updating external dependency: kubectl" - if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then - $SUDO eopkg it kubectl - log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/" - fi - - #-- helm: - log "Installing/updating external dependency: helm" - if [[ -z "$(which helm)" || "$FORCE" == true ]]; then - curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md" - fi - ;; - esac ->>>>>>> Added support for Solus. #-- CURL: log "Installing/updating external dependency: curl" @@ -477,7 +358,6 @@ function install_deps_with_yum { } #------------------------------------------------------------------------------ ->>>>>>> Added support for Solus. function install_docker { #-- Docker: