don't require WEBGUI_UPGRADE_VERSION if we can detect it from the dir directory
This commit is contained in:
parent
d700350ed1
commit
6bdeeacd50
1 changed files with 8 additions and 2 deletions
|
|
@ -41,11 +41,17 @@ my @cleanups;
|
||||||
sub _build_exports {
|
sub _build_exports {
|
||||||
my $configFile = $ENV{WEBGUI_CONFIG}
|
my $configFile = $ENV{WEBGUI_CONFIG}
|
||||||
or die 'WEBGUI_CONFIG environment variable must be specified';
|
or die 'WEBGUI_CONFIG environment variable must be specified';
|
||||||
my $version = $ENV{WEBGUI_UPGRADE_VERSION}
|
my $version = $ENV{WEBGUI_UPGRADE_VERSION};
|
||||||
or die 'WEBGUI_UPGRADE_VERSION must be set';
|
|
||||||
my $upgrade_file = $caller_upgrade_file;
|
my $upgrade_file = $caller_upgrade_file;
|
||||||
(my $vol, my $dir, my $shortname) = File::Spec->splitpath( $upgrade_file );
|
(my $vol, my $dir, my $shortname) = File::Spec->splitpath( $upgrade_file );
|
||||||
$shortname =~ s/\.[^.]*$//;
|
$shortname =~ s/\.[^.]*$//;
|
||||||
|
my $last_dir = (File::Spec->splitdir($dir))[-1];
|
||||||
|
if ( !$version && $last_dir =~ /\A\d+\.\d+\.\d+-(\d+\.\d+\.\d+)\z/msx ) {
|
||||||
|
$version = $1;
|
||||||
|
}
|
||||||
|
if (! $version) {
|
||||||
|
die 'WEBGUI_UPGRADE_VERSION must be set';
|
||||||
|
}
|
||||||
|
|
||||||
# need to be able to reference these directly in the cleanup code
|
# need to be able to reference these directly in the cleanup code
|
||||||
my $session;
|
my $session;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue