fi
git tag -f $branch
- git push origin $branch
+ git push -f origin $branch
}
+alias q='rpm -q --qf "%{N}-%|E?{%{E}:}|%{V}-%{R}.%{ARCH}\n"'
+
# undo spec utf8
# note: it will do it blindly, so any lang other than -pl is most likely broken
specutfundo() {
alias adif="dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs -x autom4te.cache"
alias pclean="sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Tylko\|Files\|Common\|Index:\|RCS file\|retrieving\)/d'"
-# makes diff from PLD CVS urls
-# requires: cvs, tee
-urldiff() {
- local url="$1"
- if [ -z "$url" ]; then
- echo >&2 "Reading STDIN"
- read url
- fi
-
- echo >&2 "Process $url"
- local file="$url"
- file=${file#*SPECS/}
- file=${file#*SOURCES/}
- file=${file##*/}
- local r1=${file#*r1=}
- local r2=${r1#*r2=}
- r2=${r2%%[&;]*}
- r1=${r1%%[&;]*}
- file=${file%\?*}
- file=${file%.diff}
-
- echo >&2 "$file: $r1 -> $r2"
-
- if [ -t 1 ]; then
- cvs diff -u -r$r1 -r$r2 $file | tee m.patch | diffcol
- else
- cvs diff -u -r$r1 -r$r2 $file
- fi
-}
-
-# makes diff from kde svn path
-# requires: wget, tee
-kdediff() {
- local url="$1" r1 r2
- # --- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc #624744:624745
- url=${url#*--- }
- echo >&2 "Process $url"
- r1=${url#*#}
- r2=${r1#*:}
- r1=${r1%:*}
-
- # http://websvn.kde.org/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc?rev=624745&r1=612579&r2=624745&makepatch=1&diff_format=u
- # http://websvn.kde.org/branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp?r1=609808&r2=673027&view=patch
- url=http://websvn.kde.org/${url% *}
- url="$url?r1=$r1&r2=$r2&view=patch"
-
- if [ -t 1 ]; then
- wget "$url" -O -| tee m.patch | diffcol
- else
- wget "$url" -O -
- fi
-}
-
# merges two patches
# requires: patchutils
pmerge() {
# does diff between FILE~ and FILE
# the diff can be applied with patch -p1
d() {
- local file="$1"
- local dir diff
+ local file="$1" dir
+ shift
if [[ "$file" = /* ]]; then
# full path -- no idea where to strip
dir=.
diff=${PWD##*/}/${file}
fi
- (builtin cd "$dir"; dif $diff{~,})
+ (builtin cd "$dir"; dif $diff{~,} "$@")
}
# spec name from NVR
sed -re 's,^(.+)-[^-]+-[^-]+$,\1.spec,'
}
-rpmb() {
- local SPEC SPECDIR arg
- for arg in "$@"; do
- case "$arg" in
- *.spec) SPEC="$arg"
- ;;
- esac
- done
- SPECDIR=$(dirname "$(pwd)/${SPEC:-.}")
- command rpmbuild --define "_specdir $SPECDIR" --define "_sourcedir $SPECDIR" "$@"
+
+#
+# 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
}