diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-07-28 16:00:57 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-07-28 16:00:57 +1200 |
commit | c206e46c9afbc0baeeb5828e4aff9888558b104d (patch) | |
tree | cf8e857ab557a591a2431659dc391dfb11b587c4 /sh/profile.d | |
parent | Merge branch 'master' into port/bsd/freebsd (diff) | |
parent | Adjust linebreak behaviour around downloads check (diff) | |
download | dotfiles-c206e46c9afbc0baeeb5828e4aff9888558b104d.tar.gz dotfiles-c206e46c9afbc0baeeb5828e4aff9888558b104d.zip |
Merge branch 'master' into port/bsd/freebsd
Diffstat (limited to 'sh/profile.d')
-rw-r--r-- | sh/profile.d/downloads.sh | 5 | ||||
-rw-r--r-- | sh/profile.d/games.sh | 2 | ||||
-rw-r--r-- | sh/profile.d/keychain.sh | 5 | ||||
-rw-r--r-- | sh/profile.d/plenv.sh | 5 |
4 files changed, 5 insertions, 12 deletions
diff --git a/sh/profile.d/downloads.sh b/sh/profile.d/downloads.sh index fb8dd64a..865cb859 100644 --- a/sh/profile.d/downloads.sh +++ b/sh/profile.d/downloads.sh @@ -15,6 +15,7 @@ esac # Count files in each directory, report if greater than zero ( + lc=0 while IFS= read -r dir ; do case $dir in '#'*) continue ;; @@ -23,6 +24,8 @@ esac set -- "$dir"/* [ -e "$1" ] || shift [ "$#" -gt 0 ] || continue - printf '\nYou have %u unsorted files in %s.\n\n' "$#" "$dir" + printf 'You have %u unsorted files in %s.\n' "$#" "$dir" + lc=$((lc+1)) done < "$HOME"/.downloads + [ "$((lc > 0))" -eq 1 ] && printf '\n' ) diff --git a/sh/profile.d/games.sh b/sh/profile.d/games.sh index ee56c593..956d1de1 100644 --- a/sh/profile.d/games.sh +++ b/sh/profile.d/games.sh @@ -1,3 +1,3 @@ # Add ~/.local/games to PATH if it exists [ -d "$HOME"/.local/games ] || return -PATH=$HOME/.local/games:$PATH +PATH=$PATH:$HOME/.local/games diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh deleted file mode 100644 index f3d25c62..00000000 --- a/sh/profile.d/keychain.sh +++ /dev/null @@ -1,5 +0,0 @@ -# keychain setup -command -v keychain >/dev/null 2>&1 || return -eval "$(TERM=${TERM:-ansi} keychain \ - --eval --ignore-missing --quick --quiet \ - id_dsa id_rsa id_ecsda)" diff --git a/sh/profile.d/plenv.sh b/sh/profile.d/plenv.sh deleted file mode 100644 index b2b491e1..00000000 --- a/sh/profile.d/plenv.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Add plenv to PATH and MANPATH if it appears to be in use -[ -d "$HOME"/.plenv ] || return -PATH=$HOME/.plenv/shims:$HOME/.plenv/bin:$PATH -MANPATH=$HOME/.plenv/versions/$(perl -e 'print substr($^V,1)')/man:$MANPATH -export MANPATH |