diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-04 09:20:10 +0900 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-07-04 09:20:10 +0900 |
commit | 76ded525bbd663896c1245dc00347a536e75a5a1 (patch) | |
tree | 1f780841abdcb9b84845ac92fd6687e01ba6f993 /lib | |
parent | f705e8365b2b871e8a9fdd2348c774274b207e7e (diff) |
improve version detection regexs
Diffstat (limited to 'lib')
-rw-r--r-- | lib/DhMakeELPA/Command/Packaging.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/DhMakeELPA/Command/Packaging.pm b/lib/DhMakeELPA/Command/Packaging.pm index 815a19a..417a006 100644 --- a/lib/DhMakeELPA/Command/Packaging.pm +++ b/lib/DhMakeELPA/Command/Packaging.pm @@ -208,7 +208,7 @@ sub extract_version { if ( -f $self->main_file("$bin.el") ) { my $fh = $self->_file_r("$bin.el"); while (my $line = $fh->getline) { - if ( $line =~ /^;; (Package-)*Version: ([0-9.]*)$/ ) { + if ( $line =~ /^;; (Package-)*Version\s*:\s+([0-9.a-zA-Z~+-]*)$/ ) { $version = "$2"; last; } @@ -218,7 +218,7 @@ sub extract_version { } elsif ( -f $self->main_file("$bin-pkg.el") ) { my $fh = $self->_file_r("$bin-pkg.el"); while (my $line = $fh->getline) { - if ( $line =~ /.*\(define-package\s+"[^"]+"\s+"([0-9.]*)"/ ) { + if ( $line =~ /.*\(define-package\s+"[^"]+"\s+"([0-9.a-zA-Z~+-]*)"/ ) { $version = "$1"; last; } |