Allow synonyms for localhost

[spider.git] / perl / issue.pl

diff --git a/perl/issue.pl b/perl/issue.pl
index c6926148a4ecc61073165fe8ea9305eddfb57b75..fd09e8594e3b2a983cbc9c368151e9d4a288f8f6 100755 (executable)
--- a/perl/issue.pl
+++ b/perl/issue.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # create a version and build id for the project using git ids
 #
@@ -18,9 +18,8 @@ use strict;
 
 use vars qw($root);
 my $fn = "$root/perl/Version.pm";
-my $desc = `git-describe`;
-my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/;
-$s ||= '0';            # account for missing subversion
+my $desc = `git describe --long`;
+my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
 $b++;                  # to account for the commit that is about to happen
 
 open F, ">$fn" or die "issue.pl: can't open $fn $!\n";
@@ -33,11 +32,13 @@ print F qq(#
 
 package main;
 
-use vars qw(\$version \$subversion \$build);
+use vars qw(\$version \$build \$gitversion);
 
 \$version = '$v';
-\$subversion = '$s';
 \$build = '$b';
+\$gitversion = '$g\[i]';
 
 1;
 );
+
+exit(0);