Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools

Conflicts:
	fullpkg

1 files changed, 29 insertions, 5 deletions

diff --git a/librecommit b/librecommit
index bec5915..9444bd9 100755
--- a/librecommit
+++ b/librecommit
@@ -21,19 +21,43 @@
 source /etc/libretools.conf
 
 usage () {
-    printf "$(gettext "cd to the dir with the PKGBUILD you are commiting and %s")" "$0"
+    echo "cd to the dir with the PKGBUILD you are commiting and"
+    echo
+    echo "$0 [optionally files to commit]"
+    echo
+    echo "This script commits the package using name, pkgver an pkgver"
     echo
-    printf "$(gettext "This script commits the package using name, pkgver an pkgver")"
 }
 
+msg='Commiting libre package $pkg-$pkgver-$pkgrel'
+files=""
+
+for opt in $@ ; do
+    case ${opt} in
+        h) usage ;;
+        m) msg=${OPTARG} ;;
+        *) files+="${opt} " ;;
+    esac
+done
+
 if [ ! -e PKGBUILD ]; then exit 1; fi
 
 source PKGBUILD
 
-pkg=$pkgbase
+pkg=${pkgbase:-${pkgname}}
+
+if [ ${COMMITCD} = 'git' ]; then
+
+    ${COMMITCD} add $@ && ${COMMITCD} -m ""
+
+elif [ ${COMMITCD} = 'hg' ]; then
+
+    ${COMMITCMD} commit $@ -m  -v || exit 1
+
+else
 
-if [ ${#pkg} -eq 0 ]; then pkg=$pkgname; fi
+    error "COMMITCD is not correctly set on libretools.conf"
 
-$COMMITCMD commit $@ -m "Commiting libre package $pkg-$pkgver-$pkgrel" -v || exit 1
+fi
 
 exit 0