Skip to contentSkip to conversation

compat-wireless: fix fallbacks for unknown branch, remote or remote URL

PATCH Applied Pavel Roskin 2 participants 2 messages Apr 7, 2010

lore
Share & tools
lore

Pavel Roskin

author
#0 lore raw

PATCH 1/1 compat-wireless: fix fallbacks for unknown branch, remote or remote URL

Use bash syntax that yields the replacement value if the variable is either empty or unset. The original code would only check for unset variables, but the variable would be set even if git failed to give any output to stdout.

Signed-off-by Pavel Roskin <[email protected]>
---
 scripts/admin-update.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
scripts/admin-update.sh +3 -3
index 5d8068d..36cdfac 100755
@@ -296,11 +296,11 @@ DIR="$PWD"
 cd $GIT_TREE
 GIT_DESCRIBE=$(git describe)
 GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p')
-GIT_BRANCH=${GIT_BRANCH-master}
+GIT_BRANCH=${GIT_BRANCH:-master}
 GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote)
-GIT_REMOTE=${GIT_REMOTE-origin}
+GIT_REMOTE=${GIT_REMOTE:-origin}
 GIT_REMOTE_URL=$(git config remote.${GIT_REMOTE}.url)
-GIT_REMOTE_URL=${GIT_REMOTE_URL-unknown}
+GIT_REMOTE_URL=${GIT_REMOTE_URL:-unknown}
 echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}"
 echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}"
 cd $DIR
Applied
#1 lore raw
Quoted 4 lines · Pavel Roskin

Use bash syntax that yields the replacement value if the variable is either empty or unset.  The original code would only check for unset variables, but the variable would be set even if git failed to give any output to stdout.

thanks applied