Skip to content

Commit 84cf3aa

Browse files
author
patrik
committed
rebased from upstream/master
1 parent 2ca2680 commit 84cf3aa

1 file changed

Lines changed: 2 additions & 122 deletions

File tree

‎linux-installer/idt-installer‎

Lines changed: 2 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,7 @@ function install_darwin_deps {
233233
fi
234234
}
235235

236-
<<<<<<< HEAD
237236
#------------------------------------------------------------------------------
238-
<<<<<<< HEAD
239-
=======
240237
function install_deps_with_apt_get {
241238
log "Checking for and updating 'apt-get' support on Linux"
242239
if [[ -z "$(which apt-get)" ]]; then
@@ -284,7 +281,7 @@ function install_deps_with_apt_get {
284281

285282
#------------------------------------------------------------------------------
286283
function install_deps_with_eopkg {
287-
logrevert "Checking for and updating 'eopkg' support on Linux"
284+
log "Checking for and updating 'eopkg' support on Linux"
288285
if [[ -z "$(which eopkg)" ]]; then
289286
error "'eopkg' is not found. Thats the only linux installer I know, sorry."
290287
fi
@@ -303,57 +300,8 @@ function install_deps_with_eopkg {
303300
fi
304301

305302
#-- Docker:
306-
log "Installing/updating external dependency: docker"
307-
if [[ -z "$(which docker)" || "$FORCE" == true ]]; then
308-
$SUDO eopkg it docker
309-
if [ "$SUDO" ]; then
310-
# Allow docker to run as a non-root user (if not running as root).
311-
sudo groupadd docker 2>/dev/null
312-
sudo usermod -aG docker $USER 2>/dev/null
313-
else
314-
log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"'
315-
=======
316-
"Linux")
317-
case "$DISTRO" in
318-
"Ubuntu")
319-
log "Checking for and updating 'apt-get' support on Linux"
320-
if [[ -z "$(which apt-get)" ]]; then
321-
error "'apt-get' is not found. Thats the only linux installer I know, sorry."
322-
fi
323-
if [[ -z "$(which add-apt-repository)" ]]; then
324-
$SUDO apt-get install -y software-properties-common python-software-properties
325-
fi
326-
$SUDO add-apt-repository -y ppa:git-core/ppa
327-
$SUDO apt-get -y update
328-
329-
#-- CURL:
330-
log "Installing/updating external dependency: curl"
331-
if [[ -z "$(which curl)" || "$FORCE" == true ]]; then
332-
$SUDO apt-get -y install curl
333-
fi
334-
#-- GIT:
335-
log "Installing/updating external dependency: git"
336-
if [[ -z "$(which git)" || "$FORCE" == true ]]; then
337-
$SUDO apt-get -y install git
338-
log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads"
339-
fi
340-
341-
#-- Docker:
342-
log "Installing/updating external dependency: docker"
343-
if [[ -z "$(which docker)" || "$FORCE" == true ]]; then
344-
curl -fsSL get.docker.com | $SUDO sh -
345-
if [ "$SUDO" ]; then
346-
# Allow docker to run as a non-root user (if not running as root).
347-
sudo groupadd docker 2>/dev/null
348-
sudo usermod -aG docker $USER 2>/dev/null
349-
else
350-
log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"'
351-
fi
352-
log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/"
353-
>>>>>>> Added support for Solus.
354-
fi
303+
install_docker
355304

356-
<<<<<<< HEAD
357305
#-- kubectl:
358306
log "Installing/updating external dependency: kubectl"
359307
if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
@@ -375,73 +323,6 @@ function install_deps_with_yum {
375323
if [[ -z "$(which yum)" ]]; then
376324
error "'yum' is not found. That's the only RedHat/Centos linux installer I know, sorry."
377325
fi
378-
=======
379-
#-- kubectl:
380-
log "Installing/updating external dependency: kubectl"
381-
if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
382-
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
383-
$SUDO mv ./kubectl /usr/local/bin/kubectl
384-
$SUDO chmod +x /usr/local/bin/kubectl
385-
log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/"
386-
fi
387-
388-
#-- helm:
389-
log "Installing/updating external dependency: helm"
390-
if [[ -z "$(which helm)" || "$FORCE" == true ]]; then
391-
curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
392-
log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md"
393-
fi
394-
;;
395-
396-
"Solus")
397-
log "Checking for and updating 'eopkg' support on Linux"
398-
if [[ -z "$(which eopkg)" ]]; then
399-
error "'eopkg' is not found. Thats the only linux installer I know, sorry."
400-
fi
401-
$SUDO eopkg ur Solus
402-
403-
#-- CURL:
404-
log "Installing/updating external dependency: curl"
405-
if [[ -z "$(which curl)" || "$FORCE" == true ]]; then
406-
$SUDO eopkg it curl
407-
fi
408-
#-- GIT:
409-
log "Installing/updating external dependency: git"
410-
if [[ -z "$(which git)" || "$FORCE" == true ]]; then
411-
$SUDO eopkg it git
412-
log "Please review any setup requirements for 'git' from: https://git-scm.com/downloads"
413-
fi
414-
415-
#-- Docker:
416-
log "Installing/updating external dependency: docker"
417-
if [[ -z "$(which docker)" || "$FORCE" == true ]]; then
418-
$SUDO eopkg it docker
419-
if [ "$SUDO" ]; then
420-
# Allow docker to run as a non-root user (if not running as root).
421-
sudo groupadd docker 2>/dev/null
422-
sudo usermod -aG docker $USER 2>/dev/null
423-
else
424-
log 'If you want to run docker without sudo run: "sudo groupadd docker && sudo usermod -aG docker $USER"'
425-
fi
426-
log "Please review any setup requirements for 'docker' from: https://docs.docker.com/engine/installation/"
427-
fi
428-
429-
#-- kubectl:
430-
log "Installing/updating external dependency: kubectl"
431-
if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
432-
$SUDO eopkg it kubectl
433-
log "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/"
434-
fi
435-
436-
#-- helm:
437-
log "Installing/updating external dependency: helm"
438-
if [[ -z "$(which helm)" || "$FORCE" == true ]]; then
439-
curl -fsSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
440-
log "Please review any setup requirements for 'helm' from: https://github.com/kubernetes/helm/blob/master/docs/install.md"
441-
fi
442-
;;
443-
esac
444-
>>>>>>> Added support for Solus.
445326

446327
#-- CURL:
447328
log "Installing/updating external dependency: curl"
@@ -477,7 +358,6 @@ function install_deps_with_yum {
477358
}
478359

479360
#------------------------------------------------------------------------------
480-
>>>>>>> Added support for Solus.
481361
function install_docker {
482362

483363
#-- Docker:

0 commit comments

Comments
 (0)