diff --git a/depends_brew b/depends_brew new file mode 100644 index 0000000..bdb9670 --- /dev/null +++ b/depends_brew @@ -0,0 +1 @@ +docker diff --git a/handlers/homebrew/install b/handlers/brew/install similarity index 100% rename from handlers/homebrew/install rename to handlers/brew/install diff --git a/instalee b/instalee index 1617472..c0be0ab 100755 --- a/instalee +++ b/instalee @@ -15,9 +15,10 @@ export dir_home="$(dirname $(find "$INSTALEE_HOME" \ -maxdepth 1 -name "handlers.available*" 2>/dev/null | head -1))" handlersfile="$dir_home/handlers.available" dir_packages="$dir_home/packages" +which tac || alias tac="tail -r" -highlight() { echo $2 "$1" >&2; } -destress() { echo $2 "$1" >&2; } +highlight() { ${2:-echo} "$1" >&2; } +destress() { ${2:-echo} "$1" >&2; } listhandlers() { ( @@ -98,7 +99,7 @@ installpkg() { pkg_entry="$(find "$handler" -name "install") $1" fi else - destress " running unhandled" -n + destress " running unhandled" printf fi destress " $pkg_entry" $pkg_entry @@ -193,9 +194,9 @@ if ! test -f "$handlersfile" then copy="$(case "$(uname)" in (MINGW64*) echo "$dir_home/handlers.available.windows";; - (DARWIN) echo "$dir_home/handlers.available.mac";; - (*) ls "$dir_home/$({ cat /etc/os-release | grep -E '^ID(_LIKE)?=' | cut -d= -f2 | grep . || lsb_release -s -i | tr 'A-Z' 'a-z'; } | - sed 's/^/handlers.available./' | paste -d' ' -s)" 2>/dev/null | head -1;; + (Darwin) echo "$dir_home/handlers.available.mac";; + (*) os="$({ cat /etc/os-release | grep -E '^ID(_LIKE)?=' || lsb_release -s -i; })" && + ls "$dir_home/$(echo "$os" | tr 'A-Z' 'a-z' | cut -d= -f2 | sed 's/^/handlers.available./' | paste -d' ' -s)" 2>/dev/null | head -1;; esac)" && test -n "$copy" && echo "Bootstrapping available handlers from $copy" && diff --git a/packages/brew/bash b/packages/brew/bash new file mode 100755 index 0000000..5f01b82 --- /dev/null +++ b/packages/brew/bash @@ -0,0 +1,2 @@ +#!/bin/bash +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" diff --git a/packages/docker-compose/brew b/packages/docker-compose/brew new file mode 100644 index 0000000..e69de29 diff --git a/packages/docker/brew b/packages/docker/brew new file mode 100644 index 0000000..b23d4b4 --- /dev/null +++ b/packages/docker/brew @@ -0,0 +1 @@ +docker calima diff --git a/packages/docker/bash b/packages/docker/linux similarity index 100% rename from packages/docker/bash rename to packages/docker/linux