[provisioning] prefer apt packages for some tools in linux

This commit is contained in:
Correl Roush 2018-02-23 16:37:02 -05:00
parent 565dc527cc
commit 37074fd9ff
2 changed files with 33 additions and 15 deletions

View file

@ -3,8 +3,8 @@ set +e
_recipe brew _recipe brew
case "$(uname -s)" in case $_PLATFORM in
Darwin) darwin)
_brew binutils _brew binutils
_brew coreutils _brew coreutils
_brew findutils --with-default-names _brew findutils --with-default-names
@ -13,8 +13,6 @@ case "$(uname -s)" in
_brew gnu-sed --with-default-names _brew gnu-sed --with-default-names
_brew gnu-tar --with-default-names _brew gnu-tar --with-default-names
_brew gnu-which --with-default-names _brew gnu-which --with-default-names
;;
esac
# File browsing # File browsing
_brew tree _brew tree
@ -23,7 +21,19 @@ _brew ncdu
# File compression # File compression
_brew p7zip _brew p7zip
_brew unrar _brew unrar
;;
*)
_recipe _apt
# File browsing
_apt tree
_apt ncdu
# File compression
_apt p7zip
_apt unrar
;;
esac
# Misc # Misc
_brew htop _brew htop

View file

@ -1,8 +1,16 @@
#!/bin/bash #!/bin/bash
set +e set +e
case $_PLATFORM in
darwin)
_recipe brew _recipe brew
_brew zsh _brew zsh
;;
*)
_recipe _apt
_apt zsh
;;
esac
__zsh_bin="$(which zsh)" __zsh_bin="$(which zsh)"
__zsh_files=(.zshrc) __zsh_files=(.zshrc)
@ -10,8 +18,8 @@ __zsh_files=(.zshrc)
if ! grep "^$__zsh_bin\$" /etc/shells >/dev/null; then if ! grep "^$__zsh_bin\$" /etc/shells >/dev/null; then
sudo sh -c "echo $__zsh_bin >> /etc/shells" sudo sh -c "echo $__zsh_bin >> /etc/shells"
fi fi
case "$(uname -s)" in case $_PLATFORM in
Darwin) darwin)
__shell=$(dscl . -read /Users/${USER} UserShell | awk '{print $2}') __shell=$(dscl . -read /Users/${USER} UserShell | awk '{print $2}')
;; ;;
*) *)