$os = "Debian $deb_version";
}
+my $pkg_version = '';
+-e '/usr/bin/dpkg-query'
+ and run( ['/usr/bin/dpkg-query',
+ '--showformat=${Version}', '--show', 'freeside'
+ ],
+ '>', \$pkg_version
+ );
+
( my $perl_ver = $^V ) =~ s/^v//;
my $db = driver_name;
$db = 'MySQL/MariaDB' if $db =~ /^mysql/;
my $db_ver = FS::Record->scalar_sql('SELECT VERSION()');
-if ( $db eq 'PostgreSQL' && $db_ver =~ /^\s*PostgreSQL\s+([\w\.]+)\s+on\s+/ ) {
+if ( $db eq 'PostgreSQL' && $db_ver =~ /^\s*PostgreSQL\s+([\w\.]+(\s+\([\w\s\.\+\-\:\~]+\))?)\s+on\s+/ ) {
$db_ver = $1;
}
{ 'title' => 'Freeside version',
'value' => $FS::VERSION,
},
+ ( length($pkg_version)
+ ? ( { 'title' => 'Package version',
+ 'value' => $pkg_version,
+ },
+ )
+ : ()
+ ),
{ 'title' => 'Operating System',
'value' => $os,
},