commit e8a30df9e016af00bf4ec3d5ed100189ed7d37ad
parent b1e7f91e3a687a8045b3e03ce03001821bfc4ed6
Author: Mark Feller <mfeller@recurly.com>
Date: Thu, 19 Dec 2019 16:35:56 -0700
allow for cask installs
Signed-off-by: Mark Feller <mfeller@recurly.com>
Diffstat:
2 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/pkgs/macos/install b/pkgs/macos/install
@@ -4,6 +4,13 @@ set -e
dotsrepo=${dotfilesrepo:-"https://gitlab.com/mark.feller/rice.git"}
pkgfile=${pkgfile:-"https://gitlab.com/mark.feller/rice/raw/master/pkgs/macos/packages"}
+trim_string() {
+ # Usage: trim_string " example string "
+ trim=${1#${1%%[![:space:]]*}}
+ trim=${trim%${trim##*[![:space:]]}}
+ printf '%s\n' "$trim"
+}
+
log() {
printf '\033[1;33m%s \033[m%s\033[m %s\n' \
"->" "${2:+[1;36m}$1${2:+[m}" "$2"
@@ -14,8 +21,18 @@ install_packages() {
([ -f "$pkgfile" ] && cp "$pkgfile" /tmp/pkgs) || curl -Ls "$pkgfile" > /tmp/pkgs
packages=$(sed '/^$/d' /tmp/pkgs | sed '/^#/d')
- while IFS=' ' read -r program comment; do
- brew install $program || brew upgrade $program
+ while IFS=' ' read -r flag program comment; do
+ program=$(trim_string $program)
+ case $flag in
+ C)
+ log "Installing $program cask"
+ brew cask install $program || brew cask upgrade $program
+ ;;
+ *)
+ log "Installing $program"
+ brew install $program || brew upgrade $program
+ ;;
+ esac
done <<EOF
$packages
EOF
@@ -26,8 +43,5 @@ install_dots() {
(cd ~/.config/rice && ./install)
}
-brew cask install alacritty
-brew cask install font-fira-mono
-
install_packages
install_dots
diff --git a/pkgs/macos/packages b/pkgs/macos/packages
@@ -1,25 +1,27 @@
# Tooling
-git is a version control system
-stow is a tool for managing symlinks for dot files
-emacs is the best editor
-lf is an extensive terminal file manager
-fd is a nicer find tool
-fzf is a fuzzy finder tool
-ripgrep is a nicer grep tool
-htop provides system usage information and displays processes
-bash is the updated bash shell
-bash-completion is completions for bash
-zsh is a shell that is compatible with bash.
-go is the go toolchain
-jq is a tool for working is json
-aspell is a spell checker
-ispell is a another spell checker
-gnupg is the latest gnupg
+ git is a version control system
+ stow is a tool for managing symlinks for dot files
+ emacs is the best editor
+ lf is an extensive terminal file manager
+ fd is a nicer find tool
+ fzf is a fuzzy finder tool
+ ripgrep is a nicer grep tool
+ htop provides system usage information and displays processes
+ bash is the updated bash shell
+ bash-completion is completions for bash
+ zsh is a shell that is compatible with bash.
+ go is the go toolchain
+ jq is a tool for working is json
+ aspell is a spell checker
+ ispell is a another spell checker
+ gnupg is the latest gnupg
+C alacritty is a fast terminal
+C font-fira-mono is a nice looking font
# Audio and Video
-ffmpeg can record and splice video and audio on the command line
-flac is for working with flac audio files
-mpd is a lightweight music daemon
-mpc is a terminal interface for mpd
-ncmpcpp is an ncurses interface for music with multiple formats and a powerful tag editor
-youtube-dl can download any YouTube video when given the link
+ ffmpeg can record and splice video and audio on the command line
+ flac is for working with flac audio files
+ mpd is a lightweight music daemon
+ mpc is a terminal interface for mpd
+ ncmpcpp is an ncurses interface for music with multiple formats and a powerful tag editor
+ youtube-dl can download any YouTube video when given the link
