diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-04 15:17:37 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-04 15:17:37 -0500 |
| commit | a6f973687fb4a1a4558f74f7da595b6902a5dce0 (patch) | |
| tree | 7111ad988010e6acb89cba4ec70bb770aa169474 | |
| parent | ecba0ac071cb866a1a80e8614db27fc4434f07b8 (diff) | |
| parent | 26c23840ee5780b8444423e74607187f000a0877 (diff) | |
Merge branch 'master' of git://lukeshu.com/dotfiles
| -rw-r--r-- | .config/bash/aliases.sh | 5 | ||||
| -rw-r--r-- | .config/dir_colors | 1 | ||||
| -rw-r--r-- | .config/pacman/makepkg.conf | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh index fe4f2c6..28b9923 100644 --- a/.config/bash/aliases.sh +++ b/.config/bash/aliases.sh @@ -6,10 +6,11 @@ # Set up colors and settings for ls/dir/vdir # ###################################################################### if [ -x "`which dircolors`" ]; then - eval "`dircolors -b`" + eval "$(dircolors -p | cat - "${XDG_CONFIG_HOME}/dir_colors" | + dircolors -b -)" alias ls='ls -1v --color=auto' alias dir='dir -v --color=auto' - alias vdir='vdir -v--color=auto' + alias vdir='vdir -v --color=auto' for xgrep in ${PATH//:/\/*grep }/*grep; do if [ -f "$xgrep" ]; then diff --git a/.config/dir_colors b/.config/dir_colors new file mode 100644 index 0000000..80484e8 --- /dev/null +++ b/.config/dir_colors @@ -0,0 +1 @@ +OTHER_WRITABLE 01;34;45 diff --git a/.config/pacman/makepkg.conf b/.config/pacman/makepkg.conf index 8dc4536..8389fb5 100644 --- a/.config/pacman/makepkg.conf +++ b/.config/pacman/makepkg.conf @@ -1,3 +1,5 @@ +#!/phony/bash + PKGDEST="${LIBREHOME:-$HOME}/packages/pkgdest" SRCDEST="${LIBREHOME:-$HOME}/packages/srcdest" SRCPKGDEST="${LIBREHOME:-$HOME}/packages/srcpkgdest" @@ -6,3 +8,17 @@ LOGDEST="${LIBREHOME:-$HOME}/packages/logdest" PACKAGER="Luke Shumaker <lukeshu@sbcglobal.net>" MAKEFLAGS="-j3" + +if type ccache &>/dev/null; then + f=false + for i in "${!BUILDENV[@]}"; do + if [[ "${BUILDENV[$i]}" == '!ccache' ]]; then + BUILDENV[$i]='ccache' + f=true + fi + done + if [[ $f == false ]]; then + BUILDENV+=('ccache') + fi + unset f i +fi |