- git support, works if called from packages directory

[packages/rpm-build-tools.git] / ci

diff --git a/ci b/ci
old mode 100644 (file)
new mode 100755 (executable)
index d17a0aa..03b8d73
--- a/ci
+++ b/ci
@@ -11,6 +11,11 @@ if [ $# -ne 1 -o ! -d "$SPECFILE" -o ! -f "$SPEC" ]; then
        exit 1
 fi
 
+if [ ! -x "$PWD/civim" ]; then
+       echo "civim missing"
+       exit 1
+fi
+
 diffcol()
 {
        # vim like diff colourization
@@ -43,17 +48,16 @@ LC_ALL=en_US.UTF-8 gawk ' {
 ' "$@"
 }
 
+pause()
+{
+       echo "$*"
+       echo -n "[Press ENTER to continue, ^C to abort] "
+       read ans
+}
+
 cvs -z9 diff -u $SPECFILE | diffcol
 
-echo -n "Proceed ? "
-read ans
-case "$ans" in
-Y|y|O|o)
-       ;;
-*)
-       exit
-       ;;
-esac
+pause "Proceed ?"
 
 sed '/^# AUTO: /d' -i "$SPEC"
 SIMPLE_DIFF="$(cvs -z9 diff "$SPEC")"
@@ -102,15 +106,7 @@ msg=""
 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"