Update homebrew and caskroom bootstraip functions

shell/caskroom.sh

@@ -2,86 +2,104 @@
 # Caskroom related stuff.
 #
 
-install_cask_global_packages () {
+bootstrap_caskroom() {
-  brew cask install \
+  local pkgs=(
-       adium-beta \
+    adium-beta
-       aerial \
+    aerial
-       alfred \
+    alfred
-       android-file-transfer \
+    android-file-transfer
-       appcleaner \
+    appcleaner
-       atom \
+    atom
-       audio-hijack \
+    audio-hijack
-       autodmg \
+    autodmg
-       bartender \
+    bartender
-       betterzip \
+    betterzip
-       bowtie \
+    bowtie
-       calibre \
+    calibre
-       carbon-copy-cloner \
+    carbon-copy-cloner
-       chicken \
+    chicken
-       cloudup \
+    cloudup
-       daisydisk \
+    daisydisk
-       deluge \
+    deluge
-       discord \
+    discord
-       docker-beta \
+    docker-beta
-       dropbox \
+    dropbox
-       ethereum-wallet \
+    ethereum-wallet
-       filebot \
+    filebot
-       firefox \
+    firefox
-       fluid \
+    fluid
-       flux \
+    flux
-       github-desktop \
+    github-desktop
-       gog-galaxy \
+    gog-galaxy
-       google-cloud-sdk \
+    google-cloud-sdk
-       google-chrome \
+    google-chrome
-       gpgtools \
+    gpgtools
-       hackety-hack \
+    hackety-hack
-       handbrake \
+    handbrake
-       insomnia \
+    insomnia
-       irccloud \
+    irccloud
-       istat-menus \
+    istat-menus
-       istumbler \
+    istumbler
-       iterm2 \
+    iterm2
-       java \
+    java
-       karabiner-elements \
+    karabiner-elements
-       keybase \
+    keybase
-       licecap \
+    licecap
-       little-snitch \
+    little-snitch
-       logitech-options \
+    logitech-options
-       mailplane \
+    mailplane
-       makemkv \
+    makemkv
-       messenger \
+    messenger
-       micro-snitch \
+    micro-snitch
-       mist \
+    mist
-       moom \
+    moom
-       mplayerx \
+    mplayerx
-       omnigraffle \
+    omnigraffle
-       openemu \
+    openemu
-       parallels-desktop \
+    parallels-desktop
-       paw \
+    paw
-       plex-media-player \
+    plex-media-player
-       postman \
+    postman
-       resolutionator \
+    resolutionator
-       ring \
+    ring
-       screenhero \
+    screenhero
-       sequel-pro \
+    sequel-pro
-       sixtyforce \
+    sixtyforce
-       skype \
+    skype
-       spotify \
+    spotify
-       stay \
+    stay
-       synology-assistant \
+    synology-assistant
-       teamviewer \
+    teamviewer
-       transmission \
+    transmission
-       ubersicht \
+    ubersicht
-       unetbootin \
+    unetbootin
-       virtualbox \
+    virtualbox
-       virtualc64 \
+    virtualc64
-       viscosity \
+    viscosity
-       visual-studio-code \
+    visual-studio-code
-       vlc \
+    vlc
-       vmware-fusion \
+    vmware-fusion
-       witgui \
+    witgui
-       wmail \
+    wmail
-       xld \
+    xld
-       yakyak \
+    yakyak
-       ynab
+    ynab
+  )
+
+  local installed=( $(brew cask list) )
+
+  for pkg in ${pkgs[@]}; do
+    local base=$(echo $pkg | awk '{print $1}')
+    local found=""
+
+    for i in ${installed[@]}; do
+      if [[ "$base" == "$i" ]]; then
+        found=1
+      fi
+    done
+
+    if [ -z "$found" ]; then
+      brew cask install "${pkg[@]}"
+    fi
+  done
 }

shell/homebrew.sh

@@ -2,29 +2,41 @@
 # Homebrew related stuff.
 #
 
-install_brew_global_packages () {
+bootstrap_homebrew () {
-  # Basic packages.
+  local pkgs=(
-  brew install \
+    ack
-       ack \
+    "aspell --with-lang-en --with-lang-el --with-lang-sv"
-       android-sdk \
+    bash
-       bash \
+    bazaar
-       bazaar \
+    git
-       git \
+    heroku
-       heroku \
+    htop
-       htop \
+    kubernetes-cli
-       kubernetes-cli \
+    mysql
-       peco \
+    peco
-       readline \
+    readline
-       reattach-to-user-namespace \
+    reattach-to-user-namespace
-       the_silver_searcher \
+    redis
-       tmux \
+    the_silver_searcher
-       wget \
+    tmux
-       zsh
+    wget
+    zsh
+  )
 
-  brew install aspell --with-lang-en --with-lang-el --with-lang-sv
+  local installed=( $(brew list) )
 
-  # Services.
+  for pkg in ${pkgs[@]}; do
-  brew install \
+    local base=$(echo $pkg | awk '{print $1}')
-       mysql \
+    local found=""
-       redis
+
+    for i in ${installed[@]}; do
+      if [[ "$base" == "$i" ]]; then
+        found=1
+      fi
+    done
+
+    if [ -z "$found" ]; then
+      brew install "${pkg[@]}"
+    fi
+  done
 }