diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2015-06-06 14:29:12 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2015-06-06 14:29:12 +1200 |
| commit | 415f6701c246363a463f828d24a86cb3e13488b6 (patch) | |
| tree | 143f1d9b0d2944a14b513c27acdb4dccd0e0f9a3 /bash/bashrc.d | |
| parent | Use magic-space expansion for !hist (diff) | |
| download | dotfiles-415f6701c246363a463f828d24a86cb3e13488b6.tar.gz dotfiles-415f6701c246363a463f828d24a86cb3e13488b6.zip | |
Avoid command substitution inline declaration
Diffstat (limited to 'bash/bashrc.d')
| -rw-r--r-- | bash/bashrc.d/grep.bash | 3 | ||||
| -rw-r--r-- | bash/bashrc.d/ls.bash | 3 | ||||
| -rw-r--r-- | bash/bashrc.d/prompt.bash | 6 | ||||
| -rw-r--r-- | bash/bashrc.d/vr.bash | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/bash/bashrc.d/grep.bash b/bash/bashrc.d/grep.bash index 52570ea2..be201741 100644 --- a/bash/bashrc.d/grep.bash +++ b/bash/bashrc.d/grep.bash @@ -6,7 +6,8 @@ fi # Define function proper grep() { - local -i colors=$( { + local -i colors + colors=$( { tput Co || tput colors } 2>/dev/null ) if ((colors >= 8)) ; then diff --git a/bash/bashrc.d/ls.bash b/bash/bashrc.d/ls.bash index 96593e33..31beb302 100644 --- a/bash/bashrc.d/ls.bash +++ b/bash/bashrc.d/ls.bash @@ -6,7 +6,8 @@ fi # Define function proper ls() { - local -i colors=$( { + local -i colors + colors=$( { tput Co || tput colors } 2>/dev/null ) if ((colors >= 8)) ; then diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 27cb9dd5..f4a1b718 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -22,10 +22,12 @@ prompt() { fi # Count available colors, reset, and format (decided shortly) - local -i colors=$( { + local -i colors + colors=$( { tput Co || tput colors } 2>/dev/null ) - local reset=$( { + local reset + reset=$( { tput me || tput sgr0 } 2>/dev/null ) local format diff --git a/bash/bashrc.d/vr.bash b/bash/bashrc.d/vr.bash index fc1de5ef..4289c15c 100644 --- a/bash/bashrc.d/vr.bash +++ b/bash/bashrc.d/vr.bash @@ -21,14 +21,16 @@ vr() { fi # Ask Git the top level - local git_root=$(cd -- "$path" && git rev-parse --show-toplevel 2>/dev/null) + local git_root + git_root=$(cd -- "$path" && git rev-parse --show-toplevel 2>/dev/null) if [[ -n $git_root ]] ; then cd -- "$git_root" return fi # Ask Mercurial the top level - local hg_root=$(cd -- "$path" && hg root 2>/dev/null) + local hg_root + hg_root=$(cd -- "$path" && hg root 2>/dev/null) if [[ -n $hg_root ]] ; then cd -- "$hg_root" return |