Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ticket 643 #644

Merged
merged 3 commits into from
Dec 9, 2016
Merged

Fix ticket 643 #644

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13b7ca8
Merge remote-tracking branch 'hplato/ia7'
hollie Sep 27, 2016
6ea5965
Merge branch 'master' of github.com:hollie/misterhouse
hollie Dec 8, 2016
d48dab7
Don't run git when we're not in a repository
hollie Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bin/mh
View file
Open in desktop
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