Use "git describe" if "git-describe" isn't on the path

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 7e7b5ccbe33735a1dc0168c49c78f27c5a2e56a1..4d988db4ae7e28b854eac40330b9ecd4d84ebfbe 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -251,7 +251,14 @@ sub get_our_version ($$) {
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
     $aref->{"${prefix}fixes"}= 'lastpage checkpager';
 
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
     $aref->{"${prefix}fixes"}= 'lastpage checkpager';
 

-    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
+    my $version= `
+       if type -p git-describe >/dev/null 2>&1; then
+               gd=git-describe
+       else
+               gd="git describe"
+       fi
+       \$gd --tags HEAD || echo 0unknown
+    `; $? and die $?;

     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;
     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;