Fixed version reported when run from Git (issue #55)

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 739fd86..2a27c46 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -8,7 +8,11 @@
 
 # variables {{{
 PN="$(basename "$0")"
-VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
+if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then
+  VERSION="$(git describe | sed 's|^v||')"
+else
+  VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
+fi
 VERSION="${VERSION:-unknown}"
 MNTPOINT="/mnt/debootstrap.$$"
 
@@ -378,7 +382,7 @@ fi
 
 # make sure we have what we need {{{
 if [ -n "$VIRTUAL" ] ; then
-  check4progs kpartx mksh parted qemu-img || bailout 1
+  check4progs grub-mkimage kpartx mksh parted qemu-img || bailout 1
 fi
 # }}}