dotfiles

commit 4ed5b15b204d52f0c890a5f691b69213857c0cca
parent 6b4ac97720a9246dbdd2c1224edf168f7b729db1
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Fri, 29 Sep 2017 06:52:51 -0700

do not exit on failed scripts, install apt packages in one call

Diffstat:
M
init/20_debian_apt.sh
 | 
9
++++-----
M
init/20_osx_homebrew.sh
 | 
2
+-
M
init/30_osx_casks.sh
 | 
2
+-
M
init/30_osx_recipes.sh
 | 
2
+-
M
install.sh
 | 
2
+-

5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/init/20_debian_apt.sh b/init/20_debian_apt.sh
@@ -59,7 +59,6 @@ apt_packages=(
     tig
     tmux
     tor
-    torbrowser-launcher
     urlview
     vim
     vim-nox
@@ -76,10 +75,10 @@ apt_packages=(
     zsh
 )
 
-for package in "${apt_packages[@]}"; do
-    sudo apt install -qq install "$package"
-done
-
+#for package in "${apt_packages[@]}"; do
+    #sudo apt -qq install "$package"
+#done
+sudo apt -qq install "${apt_packages[@]}"
 
 
 # configure xdg-open with `mimeopen -d <file>`
diff --git a/init/20_osx_homebrew.sh b/init/20_osx_homebrew.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # OSX-stuff only
-[[ "$(uname)" != "Darwin" ]] && return 1
+[[ "$(uname)" != "Darwin" ]] && return 0
 
 [[ "$(type -P brew)" ]] && echo "Homebrew already installed." && return 0
 
diff --git a/init/30_osx_casks.sh b/init/30_osx_casks.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # OSX-stuff only
-[[ "$(uname)" != "Darwin" ]] && return 1
+[[ "$(uname)" != "Darwin" ]] && return 0
 
 # Exit if, for some reason, Homebrew is not installed.
 [[ ! "$(type -P brew)" ]] && echo "Homebrew failed to install." && return 1
diff --git a/init/30_osx_recipes.sh b/init/30_osx_recipes.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # OSX-stuff only
-[[ "$(uname)" != "Darwin" ]] && return 1
+[[ "$(uname)" != "Darwin" ]] && return 0
 
 ## Exit if, for some reason, Homebrew is not installed.
 [[ ! "$(type -P brew)" ]] && echo "Recipes need Homebrew to install." && return 1
diff --git a/install.sh b/install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Run initialization scripts
 for s in init/*.sh; do