Updated nameing (svn -> git) & fixed whitespaces.

diff --git a/armsrc/util.c b/armsrc/util.c
index 905bad253bf2d334ada7c37dd011eb079945ba1a..a250e5293d5e3f46e0c755b82583cbb5071789cb 100644 (file)
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -239,7 +239,7 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
                return;
        }
 
                return;
        }
 

-       strncat(dst, v->svnversion, len);
+       strncat(dst, v->gitversion, len);

        if(v->clean == 0) {
                strncat(dst, "-unclean", len);
        } else if(v->clean == 2) {
        if(v->clean == 0) {
                strncat(dst, "-unclean", len);
        } else if(v->clean == 2) {

diff --git a/include/proxmark3.h b/include/proxmark3.h
index ee76875ebc39b7ce10822346c4d963886338681c..ce263ca11a0d3dc456e355a931b08ffe768ac884 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -89,7 +89,7 @@ struct version_information {
        char versionversion; /* Must be 1 */
        char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
        char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */
        char versionversion; /* Must be 1 */
        char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
        char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */

-       char svnversion[50]; /* String with the SVN revision */
+       char gitversion[50]; /* String with the git revision */

        char buildtime[30]; /* string with the build time */
 } __attribute__((packed));
 
        char buildtime[30]; /* string with the build time */
 } __attribute__((packed));
 

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index de394a85d67214dd00e015eaaf30a0cb7b99f45c..19616441ad15e0338e688b02c6d8be84bb7f9ace 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -7,7 +7,7 @@
 # --- Martin Holst Swende <martin@swende.se>
 
 
 # --- Martin Holst Swende <martin@swende.se>
 
 

-# Clear environment locale so that svn will not use localized strings
+# Clear environment locale so that git will not use localized strings

 $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 


@@ -16,9 +16,9 @@ my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
 my $clean = 2;
 my @compiletime = gmtime();
 
 my $clean = 2;
 my @compiletime = gmtime();
 

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

 
 

-$fullgitinfo=~ s/(\s)//g;
+$fullgitinfo =~ s/(\s)//g;

 
 # Crop so it fits within 50 characters
 $fullgitinfo =~ s/.{50}\K.*//s;
 
 # Crop so it fits within 50 characters
 $fullgitinfo =~ s/.{50}\K.*//s;