dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkversion: add --undecided

Browse Source
This commit is contained in:
Philippe Teuwen
2020-05-21 11:50:03 +02:00
parent 53cb36447f
commit 4382f8c9be
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/mkversion.pl
View File

@@ -18,7 +18,7 @@ my $fullgitinfo = 'RRG/Iceman';
my $ctime;
# GIT status 0 = dirty, 1 = clean , 2 = undecided
my $clean = 2;
my $undecided = (defined $ARGV[0]) && ($ARGV[0] =~ '--undecided');
# Do we have acces to git command?
#######
# solves some bug on macos i.e:
@@ -37,8 +37,9 @@ if ( defined($commandGIT) ) {
# now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
my $gitversion = `git describe --dirty --always`;
my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
$clean = $gitversion =~ '-dirty' ? 0 : 1;
if (not $undecided) {
$clean = $gitversion =~ '-dirty' ? 0 : 1;
}
if ( defined($gitbranch) and defined($gitversion) ) {
$fullgitinfo = $fullgitinfo.'/'. $gitbranch . '/' . $gitversion;

10
tools/mkversion.sh
View File

@@ -21,10 +21,12 @@ if [ "$commandGIT" != "" ]; then
# now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
gitversion=$(git describe --dirty --always)
gitbranch=$(git rev-parse --abbrev-ref HEAD)
if [ "$gitversion" != "${gitversion%-dirty}" ]; then
clean=0
else
clean=1
if [ "$1" != "--undecided" ]; then
if [ "$gitversion" != "${gitversion%-dirty}" ]; then
clean=0
else
clean=1
fi
fi
if [ "$gitbranch" != "" ] && [ "$gitversion" != "" ]; then
fullgitinfo="${fullgitinfo}/${gitbranch}/${gitversion}"