#!/bin/sh
-SPECFILE="$1"
-SPECFILE="${SPECFILE%%/*}"
-SPECFILE="$(basename $SPECFILE .spec)"
-SPEC="$SPECFILE/$SPECFILE.spec"
+SPEC=$(basename "$1" .spec).spec
+PACKAGE=$(basename "$SPEC" .spec)
+TOPDIR=$(rpm -E %_topdir)
+PACKAGEDIR=$TOPDIR/$PACKAGE
+SPECFILE="$TOPDIR/$PACKAGE/$SPEC"
CLEANBUILDDIR="$HOME/PLD"
+CIVIM=$PWD/civim
-if [ $# -ne 1 -o ! -d "$SPECFILE" -o ! -f "$SPEC" ]; then
+if [ $# -ne 1 -o ! -d "$PACKAGEDIR" -o ! -f "$SPECFILE" ]; then
echo "spec file missing"
exit 1
fi
+if [ ! -x "$CIVIM" ]; then
+ echo "civim missing"
+ exit 1
+fi
+
diffcol()
{
# vim like diff colourization
' "$@"
}
-cvs -z9 diff -u $SPECFILE | diffcol
+pause()
+{
+ echo "$*"
+ echo -n "[Press ENTER to continue, ^C to abort] "
+ read ans
+}
+
+cd $PACKAGEDIR
-echo -n "Proceed ? "
-read ans
-case "$ans" in
-Y|y|O|o)
- ;;
-*)
- exit
- ;;
-esac
+git diff --color=auto $SPEC
-sed '/^# AUTO: /d' -i "$SPEC"
-SIMPLE_DIFF="$(cvs -z9 diff "$SPEC")"
+pause "Proceed ?"
-./adapter "$SPEC"
+sed '/^# AUTO: /d' -i "$SPECFILE"
+SIMPLE_DIFF="$(cd $PACKAGEDIR && git diff "$SPEC")"
-diff="$(cvs -z9 diff -u $SPEC)"
+./adapter "$SPECFILE"
-echo "$diff" | diffcol
+diff=$(git diff $SPEC)
+git diff --color=auto $SPEC
ver=$(echo "$diff" | awk '
/^\+Version/ { ver = $2 }
echo
echo "Message:"
echo "$msg"
-echo -n "Commit ? "
-read ans
-case "$ans" in
-Y|y|O|o)
- ;;
-*)
- exit
- ;;
-esac
+pause "Commit ?"
export COMMIT_MESSAGE="$msg"
export COMMIT_PACKAGES="$SPECFILE"
-export VISUAL="$PWD/civim"
-cvs -z9 ci "$SPECFILE"
+export VISUAL="$CIVIM"
+git ci "$SPECFILE"
-[ -n "$CLEANBUILDDIR" ] && rm -f $CLEANBUILDDIR/installed/$SPECFILE
+[ -n "$CLEANBUILDDIR" ] && rm -f $CLEANBUILDDIR/installed/$SPEC