Skip to content

Commit

Permalink
Merge pull request #644 from hollie/fix_ticket_643
Browse files Browse the repository at this point in the history
Fix ticket 643
  • Loading branch information
hplato authored Dec 9, 2016
2 parents abd43a8 + d48dab7 commit 4d03237
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bin/mh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ BEGIN {
$Version .= " (compiler: $Info{Perl_compiled})" if $Info{Perl_compiled};

#Create a build number if this is unstable version
if ( lc $Version eq 'unstable' ) {
# but only do this if we're on a .git version, not when we started from a zip file archive
if ( lc $Version eq 'unstable' && -e '../.git' ) {
my $build = lc `git describe --long`;
$build =~ /(\S+)-(\d+)-g([0-9a-f]+)/;
$Version = "$1 Build $2 ($3)" if ( $1 && defined($2) && $3 );
Expand Down Expand Up @@ -291,7 +292,7 @@ BEGIN {
chomp $autover;
close(VERSION);
}
if ( lc $autover eq 'unstable' ) {
if ( lc $autover eq 'unstable' && -e '../.git') {
my $build_date = `git show -s --format="%ci"`;
$Version_date = $build_date
if ( $build_date =~ /^\d\d\d\d-\d\d-\d\d/ );
Expand Down

0 comments on commit 4d03237

Please sign in to comment.