From 77062411d5b0cf9db05dea16e825e991e6184361 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 20 Aug 2013 12:56:53 +1200
Subject: Remove unnecessary quoting in simple assignments

---
 bash/bashrc.d/prompt.bash | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'bash/bashrc.d/prompt.bash')

diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash
index 23c9d64b..74eae891 100644
--- a/bash/bashrc.d/prompt.bash
+++ b/bash/bashrc.d/prompt.bash
@@ -2,7 +2,7 @@
 prompt() {
 
     # Variables for use only within this function
-    local -i ret=$? colors="$(tput colors)"
+    local -i ret=$? colors=$(tput colors)
     local color reset branch state info url root
 
     # What's done next depends on the first argument to the function
@@ -15,15 +15,15 @@ prompt() {
 
             # Check if we have non-bold bright green available
             if ((colors > 8)); then
-                color="$(tput setaf 10)"
+                color=$(tput setaf 10)
 
             # If we don't, fall back to the bold green
             else
-                color="$(tput setaf 2)$(tput bold)"
+                color=$(tput setaf 2)$(tput bold)
             fi
 
             # Reset color and attributes
-            reset="$(tput sgr0)"
+            reset=$(tput sgr0)
 
             # String it all together
             PS1="\\[$color\\]$PS1\\[$reset\\] "
@@ -54,32 +54,32 @@ prompt() {
 
             # Figure out the branch to show for HEAD, whether a symbolic
             # reference or a short SHA-1; chop off any leading path
-            branch="$(git symbolic-ref --quiet HEAD 2>/dev/null)" \
-                || branch="$(git rev-parse --short HEAD 2>/dev/null)" \
+            branch=$(git symbolic-ref --quiet HEAD 2>/dev/null) \
+                || branch=$(git rev-parse --short HEAD 2>/dev/null) \
                 || branch='unknown'
-            branch="${branch##*/}"
+            branch=${branch##*/}
 
             # If there are staged changes in the working tree, add a plus sign
             # to the state
             if ! git diff --quiet --ignore-submodules --cached; then
-                state="${state}+"
+                state=$state+
             fi
 
             # If there are any modified tracked files in the working tree, add
             # an exclamation mark to the state
             if ! git diff-files --quiet --ignore-submodules --; then
-                state="${state}!"
+                state=$state!
             fi
 
             # If there are any stashed changes, add a circumflex to the state
             if $(git rev-parse --verify refs/stash &>/dev/null); then
-                state="${state}^"
+                state=$state^
             fi
 
             # If there are any new unignored files in the working tree, add a
             # question mark to the state
             if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-                state="${state}?"
+                state=$state?
             fi
 
             # Print the status in brackets with a git: prefix
@@ -90,14 +90,14 @@ prompt() {
         hg)
 
             # Exit if not inside a Mercurial tree
-            if ! branch="$(hg branch 2>/dev/null)"; then
+            if ! branch=$(hg branch 2>/dev/null); then
                 return 1
             fi
 
             # If there are changes in the tree, add an exclamation mark to the
             # state
             if [[ -n $(hg status 2>/dev/null) ]]; then
-                state="!"
+                state=!
             fi
 
             # Print the status in brackets with an hg: prefix
@@ -113,24 +113,22 @@ prompt() {
             fi
 
             # Determine the repository URL and root directory
-            info="$(svn info 2>/dev/null)"
-            url="$(awk -F': ' '$1 == "URL" {print $2}' \
-                <<<"$info")"
-            root="$(awk -F': ' '$1 == "Repository Root" {print $2}' \
-                <<<"$info")"
+            info=$(svn info 2>/dev/null)
+            url=$(awk -F': ' '$1 == URL" {print $2}' <<<"$info")
+            root=$(awk -F': ' '$1 == "Repository Root" {print $2}' <<<"$info")
 
             # Remove the root from the URL to get what's hopefully the branch
             # name, removing leading slashes and the 'branches' prefix, and any
             # trailing content after a slash
-            branch="${url/$root}"
-            branch="${branch#/}"
-            branch="${branch#branches/}"
-            branch="${branch%%/*}"
+            branch=${url/$root}
+            branch=${branch#/}
+            branch=${branch#branches/}
+            branch=${branch%%/*}
 
             # If there are changes in the working directory, add an exclamation
             # mark to the state
             if [[ -n $(svn status 2>/dev/null) ]]; then
-                state="!"
+                state=!
             fi
 
             # Print the state in brackets with an svn: prefix
-- 
cgit v1.2.3