diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | git-sonar | 22 |
2 files changed, 13 insertions, 13 deletions
@@ -19,9 +19,9 @@ all: install: @echo 'Installing in' $(PREFIX) '...' - mkdir -p $(PREFIX)/bin $(PREFIX)/share/man/man1 + mkdir -p $(PREFIX)/bin $(PREFIX)/man/man1 install -m 755 $(SOURCE) $(PREFIX)/bin - install -m 644 $(MANPAGES) $(PREFIX)/share/man/man1 + install -m 644 $(MANPAGES) $(PREFIX)/man/man1 develop: # Link each file separately since the full PWD is needed @@ -1,6 +1,6 @@ #!/bin/sh -GIT_SONAR_VERSION="v0.9.0-dev" +GIT_SONAR_VERSION="v0.9.0" version() { exec printf 'git-sonar %s\n' "$GIT_SONAR_VERSION"; } docs() { exec man 1 git-sonar; } @@ -73,7 +73,7 @@ PROMPT_COLOR="${GIT_SONAR_PROMPT_COLOR:-"$COLOR_GRAY"}" PROMPT_FORMAT="${GIT_SONAR_PROMPT_FORMAT:-" ${PROMPT_COLOR}git:(${COLOR_DEF}%{alert}%{remote: }%{branch}%{ :local}${PROMPT_COLOR})${COLOR_DEF}%{ :stash}%{ :status}"}" # Gather information about the current git branch. -upstream_name="$(git rev-parse --abbrev-ref '@{upstream}' 2>/dev/null)" +upstream_name="$(git rev-parse --abbrev-ref '@{upstream}' 2>/dev/null)" || upstream_name="" branch_name="$(git symbolic-ref --short HEAD 2>/dev/null)" commit_hash="$(git rev-parse --short HEAD 2>/dev/null)" @@ -214,9 +214,9 @@ SED_POST="\(\:\([^%^{^}]*\)\)\{0,1\}}" prepare_element() { result="$($2 | sed 's/\//\\\//g')" if [ -n "$result" ]; then - printf '%b' "s/${SED_PRE}${1}${SED_POST}/\\\\2${result}\\\\4/" + sed "s/${SED_PRE}${1}${SED_POST}/\\2${result}\\4/" else - printf '%b' "s/${SED_PRE}${1}${SED_POST}//" + sed "s/${SED_PRE}${1}${SED_POST}//" fi } @@ -234,10 +234,10 @@ if [ -n "$opt_fetch" ]; then fi # Render prompt elements from format string -printf '%b' "$PROMPT_FORMAT" | sed \ - -e "$(prepare_element alert element_alert)" \ - -e "$(prepare_element branch element_branch)" \ - -e "$(prepare_element remote element_remote)" \ - -e "$(prepare_element local element_local)" \ - -e "$(prepare_element stash element_stash)" \ - -e "$(prepare_element status element_status)" +printf '%b' "$PROMPT_FORMAT" \ + | prepare_element alert element_alert \ + | prepare_element branch element_branch \ + | prepare_element remote element_remote \ + | prepare_element local element_local \ + | prepare_element stash element_stash \ + | prepare_element status element_status |