projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix next-bill-ignore-time, RT#24318, RT#24476, RT#12570
[freeside.git]
/
rt
/
sbin
/
rt-setup-database.in
diff --git
a/rt/sbin/rt-setup-database.in
b/rt/sbin/rt-setup-database.in
index
9760c54
..
264e5aa
100644
(file)
--- a/
rt/sbin/rt-setup-database.in
+++ b/
rt/sbin/rt-setup-database.in
@@
-3,7
+3,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
3
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-150,7
+150,9
@@
if ( $db_type eq 'SQLite' && !File::Spec->file_name_is_absolute($db_name) ) {
}
my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || $db_user || '';
}
my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || $db_user || '';
-my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'};
+my $dba_pass = exists($args{'dba-password'})
+ ? $args{'dba-password'}
+ : $ENV{'RT_DBA_PASSWORD'};
if ( !$args{force} && ( !defined $dba_pass || $args{'prompt-for-dba-password'} ) ) {
$dba_pass = get_dba_password();
if ( !$args{force} && ( !defined $dba_pass || $args{'prompt-for-dba-password'} ) ) {
$dba_pass = get_dba_password();
@@
-339,7
+341,7
@@
sub action_upgrade {
sub get_versions_from_to {
my ($base_dir, $from, $to) = @_;
sub get_versions_from_to {
my ($base_dir, $from, $to) = @_;
- opendir
my $dh, $base_dir
or die "couldn't open dir: $!";
+ opendir
( my $dh, $base_dir )
or die "couldn't open dir: $!";
my @versions = grep -d "$base_dir/$_" && /\d+\.\d+\.\d+/, readdir $dh;
closedir $dh;
my @versions = grep -d "$base_dir/$_" && /\d+\.\d+\.\d+/, readdir $dh;
closedir $dh;