updated for git

diff --git a/ci b/ci
index 03b8d7389289e461586a0f7e7835187dd42ead40..3e9bf22cb737e73847bcff400b0aa104de05ce88 100755 (executable)
--- a/ci
+++ b/ci
@@ -1,17 +1,19 @@
 #!/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 "$PWD/civim" ]; then
+if [ ! -x "$CIVIM" ]; then
        echo "civim missing"
        exit 1
 fi
@@ -55,18 +57,19 @@ pause()
        read ans
 }
 
-cvs -z9 diff -u $SPECFILE | diffcol
+cd $PACKAGEDIR
 
-pause "Proceed ?"
+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 }
@@ -110,7 +113,7 @@ 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