[packages/rpm-build-tools] move bash prompt to separate file
glen
glen at pld-linux.org
Wed Mar 16 12:13:50 CET 2016
commit 9d0d2184e9192dc563049fc8150a5b7a28bf9a68
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 16 13:12:52 2016 +0200
move bash prompt to separate file
causes issues when sourced from mksh
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-March/024742.html
bash-prompt.sh | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++
rpm-build-tools.spec | 9 ++--
shrc.sh | 117 --------------------------------------------------
3 files changed, 124 insertions(+), 120 deletions(-)
---
diff --git a/rpm-build-tools.spec b/rpm-build-tools.spec
index d7e9f60..a307902 100644
--- a/rpm-build-tools.spec
+++ b/rpm-build-tools.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл
Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів
Name: rpm-build-tools
Version: 4.8
-Release: 3
+Release: 4
License: GPL
Group: Applications/File
Group: Base
@@ -14,7 +14,8 @@ Source0: builder.sh
Source1: adapter.awk
Source2: adapter.sh
Source4: shrc.sh
-Source5: dropin
+Source5: bash-prompt.sh
+Source6: dropin
BuildRequires: sed >= 4.0
Requires: gawk >= 3.1.7
Requires: git-core >= 1.7
@@ -75,8 +76,9 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/etc/shrc.d}
cp -p adapter.awk $RPM_BUILD_ROOT%{_libdir}/adapter.awk
install -p builder.sh $RPM_BUILD_ROOT%{_bindir}/builder
install -p adapter.sh $RPM_BUILD_ROOT%{_bindir}/adapter
-install -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}
install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/bash-prompt.sh
%clean
rm -rf $RPM_BUILD_ROOT
@@ -88,3 +90,4 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/dropin
/etc/shrc.d/rpm-build.sh
%{_libdir}/adapter.awk
+%{_libdir}/bash-prompt.sh
diff --git a/bash-prompt.sh b/bash-prompt.sh
new file mode 100644
index 0000000..739e950
--- /dev/null
+++ b/bash-prompt.sh
@@ -0,0 +1,118 @@
+# NOTE:
+# This code works known to work for bash
+
+# To use it, source this file and set $PROMPT_COMMAND env var:
+# PROMPT_COMMAND=__bash_prompt_command
+
+#
+# A colorized bash prompt
+# - shows curret branch
+# - shows if branch is up to date/ahead/behind
+# - shows if last command exited with error (red)
+#
+__bash_prompt_command() {
+ local previous_return_value=$?
+
+ local RED="\[\033[0;31m\]"
+ local YELLOW="\[\033[0;33m\]"
+ local GREEN="\[\033[0;32m\]"
+ local BLUE="\[\033[0;34m\]"
+ local LIGHT_RED="\[\033[1;31m\]"
+ local LIGHT_GREEN="\[\033[1;32m\]"
+ local WHITE="\[\033[1;37m\]"
+ local LIGHT_GRAY="\[\033[0;37m\]"
+ local COLOR_NONE="\[\e[0m\]"
+
+ # if we are in rpm subdir and have exactly one .spec in the dir, include package version
+ __package_update_rpmversion
+ local rpmver=$(__package_rpmversion)
+
+ local prompt="${BLUE}[${RED}\w${GREEN}${rpmver:+($rpmver)}$(__bash_parse_git_branch)${BLUE}]${COLOR_NONE} "
+ if [ $previous_return_value -eq 0 ]; then
+ PS1="${prompt}➔ "
+ else
+ PS1="${prompt}${RED}➔${COLOR_NONE} "
+ fi
+}
+
+# helper for __bash_prompt_command
+# command line (git) coloring
+# note we use "\" here to avoid any "git" previous alias/func
+__bash_parse_git_branch() {
+ # not in git dir. return early
+ \git rev-parse --git-dir &> /dev/null || return
+
+ local git_status branch_pattern remote_pattern diverge_pattern
+ local state remote branch
+
+ git_status=$(\git -c color.ui=no status 2> /dev/null)
+ branch_pattern="^On branch ([^${IFS}]*)"
+ remote_pattern="Your branch is (behind|ahead) "
+ diverge_pattern="Your branch and (.*) have diverged"
+
+ if [[ ! ${git_status} =~ "working directory clean" ]]; then
+ state="${RED}⚡"
+ fi
+
+ # add an else if or two here if you want to get more specific
+ if [[ ${git_status} =~ ${remote_pattern} ]]; then
+ if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
+ remote="${YELLOW}↑"
+ else
+ remote="${YELLOW}↓"
+ fi
+ fi
+
+ if [[ ${git_status} =~ ${diverge_pattern} ]]; then
+ remote="${YELLOW}↕"
+ fi
+
+ if [[ ${git_status} =~ ${branch_pattern} ]]; then
+ branch=${BASH_REMATCH[1]}
+ echo " (${branch})${remote}${state}"
+ fi
+}
+
+# cache requires bash 4.x
+declare -A __package_update_rpmversion_cache
+__package_update_rpmversion() {
+ # extract vars from cache
+ set -- ${__package_update_rpmversion_cache[$PWD]}
+ local specfile=$1 version=$2 mtime=$3
+
+ # invalidate cache
+ if [ -f "$specfile" ]; then
+ local stat
+ stat=$(stat -c %Y $specfile)
+ if [ $mtime ] && [ $stat -gt $mtime ]; then
+ unset version
+ fi
+ mtime=$stat
+ else
+ # reset cache, .spec may be renamed
+ unset version specfile
+ fi
+
+ # we have cached version
+ test -n "$version" && return
+
+ # needs to be one file
+ specfile=${specfile:-$(\ls *.spec 2>/dev/null)}
+ if [ ! -f "$specfile" ]; then
+ unset __package_update_rpmversion_cache[$PWD]
+ return
+ fi
+
+ mtime=${mtime:-$(stat -c %Y $specfile)}
+
+ # give only first version (ignore subpackages)
+ version=$(rpm --define "_specdir $PWD" --specfile $specfile -q --qf '%{VERSION}\n' | head -n1)
+ __package_update_rpmversion_cache[$PWD]="$specfile ${version:-?} $mtime"
+}
+
+__package_rpmversion() {
+ # extract vars from cache
+ set -- ${__package_update_rpmversion_cache[$PWD]}
+ # print version
+ echo $2
+}
diff --git a/shrc.sh b/shrc.sh
index 8ccc257..a15e0e5 100755
--- a/shrc.sh
+++ b/shrc.sh
@@ -262,120 +262,3 @@ d() {
rpm2spec() {
sed -re 's,^(.+)-[^-]+-[^-]+$,\1.spec,'
}
-
-
-#
-# A colorized bash prompt
-# - shows curret branch
-# - shows if branch is up to date/ahead/behind
-# - shows if last command exited with error (red)
-#
-# To use it, set $PROMPT_COMMAND env var:
-# PROMPT_COMMAND=__bash_prompt_command
-#
-__bash_prompt_command() {
- local previous_return_value=$?
-
- local RED="\[\033[0;31m\]"
- local YELLOW="\[\033[0;33m\]"
- local GREEN="\[\033[0;32m\]"
- local BLUE="\[\033[0;34m\]"
- local LIGHT_RED="\[\033[1;31m\]"
- local LIGHT_GREEN="\[\033[1;32m\]"
- local WHITE="\[\033[1;37m\]"
- local LIGHT_GRAY="\[\033[0;37m\]"
- local COLOR_NONE="\[\e[0m\]"
-
- # if we are in rpm subdir and have exactly one .spec in the dir, include package version
- __package_update_rpmversion
- local rpmver=$(__package_rpmversion)
-
- local prompt="${BLUE}[${RED}\w${GREEN}${rpmver:+($rpmver)}$(__bash_parse_git_branch)${BLUE}]${COLOR_NONE} "
- if [ $previous_return_value -eq 0 ]; then
- PS1="${prompt}➔ "
- else
- PS1="${prompt}${RED}➔${COLOR_NONE} "
- fi
-}
-
-# helper for __bash_prompt_command
-# command line (git) coloring
-# note we use "\" here to avoid any "git" previous alias/func
-__bash_parse_git_branch() {
- # not in git dir. return early
- \git rev-parse --git-dir &> /dev/null || return
-
- local git_status branch_pattern remote_pattern diverge_pattern
- local state remote branch
-
- git_status=$(\git -c color.ui=no status 2> /dev/null)
- branch_pattern="^On branch ([^${IFS}]*)"
- remote_pattern="Your branch is (behind|ahead) "
- diverge_pattern="Your branch and (.*) have diverged"
-
- if [[ ! ${git_status} =~ "working directory clean" ]]; then
- state="${RED}⚡"
- fi
-
- # add an else if or two here if you want to get more specific
- if [[ ${git_status} =~ ${remote_pattern} ]]; then
- if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
- remote="${YELLOW}↑"
- else
- remote="${YELLOW}↓"
- fi
- fi
-
- if [[ ${git_status} =~ ${diverge_pattern} ]]; then
- remote="${YELLOW}↕"
- fi
-
- if [[ ${git_status} =~ ${branch_pattern} ]]; then
- branch=${BASH_REMATCH[1]}
- echo " (${branch})${remote}${state}"
- fi
-}
-
-# cache requires bash 4.x
-declare -A __package_update_rpmversion_cache
-__package_update_rpmversion() {
- # extract vars from cache
- set -- ${__package_update_rpmversion_cache[$PWD]}
- local specfile=$1 version=$2 mtime=$3
-
- # invalidate cache
- if [ -f "$specfile" ]; then
- local stat
- stat=$(stat -c %Y $specfile)
- if [ $mtime ] && [ $stat -gt $mtime ]; then
- unset version
- fi
- mtime=$stat
- else
- # reset cache, .spec may be renamed
- unset version specfile
- fi
-
- # we have cached version
- test -n "$version" && return
-
- # needs to be one file
- specfile=${specfile:-$(\ls *.spec 2>/dev/null)}
- if [ ! -f "$specfile" ]; then
- unset __package_update_rpmversion_cache[$PWD]
- return
- fi
-
- mtime=${mtime:-$(stat -c %Y $specfile)}
-
- # give only first version (ignore subpackages)
- version=$(rpm --define "_specdir $PWD" --specfile $specfile -q --qf '%{VERSION}\n' | head -n1)
- __package_update_rpmversion_cache[$PWD]="$specfile ${version:-?} $mtime"
-}
-
-__package_rpmversion() {
- # extract vars from cache
- set -- ${__package_update_rpmversion_cache[$PWD]}
- # print version
- echo $2
-}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/9d0d2184e9192dc563049fc8150a5b7a28bf9a68
More information about the pld-cvs-commit
mailing list