Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 3edc360594573e1da6b38886fe160a67c2bbda1e..f726640e946b0aec7734ec5a6d66900a2507b4be 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -15,15 +15,15 @@ $ENV{'LANG'} = "C";
 my $githistory = `git fetch --all`;
 my $gitversion = `git describe --dirty`;
 my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
 my $githistory = `git fetch --all`;
 my $gitversion = `git describe --dirty`;
 my $gitbranch = `git rev-parse --abbrev-ref HEAD`;

-my $clean = 2;
-my @compiletime = gmtime();
+my $clean = $gitversion =~ '-dirty' ? 0 : 1;
+my @compiletime = localtime();

 
 my $fullgitinfo = 'iceman';
 
 if ( defined $gitbranch and defined $gitversion ) {
 
 my $fullgitinfo = 'iceman';
 
 if ( defined $gitbranch and defined $gitversion ) {

-       $fullgitinfo =  '/'. $gitbranch . '/' . $gitversion;
+       $fullgitinfo =  $fullgitinfo.'/'. $gitbranch . '/' . $gitversion;

 } else {
 } else {

-       $fullgitinfo =  '/master/release-build (no_git)';
+       $fullgitinfo =  $fullgitinfo.'/master/release-build (no_git)';

 }
 
 $fullgitinfo =~ s/(\s)//g;
 }
 
 $fullgitinfo =~ s/(\s)//g;