Skip to content

Enhance functions for multi-OS support #100

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

Open
msjang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enhance functions for multi-OS support #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf24e70
Enhance package_version for multi-OS support
msjang Sep 2, 2025
31702c9
Enhance set_sidebar_vars for multi-OS support
msjang Sep 2, 2025
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
31 changes: 23 additions & 8 deletions libperfsonar/libperfsonar/lib/perfSONAR_PS/NPToolkit/Services/Base.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use warnings;
use Log::Log4perl qw(:easy);
use File::Spec;
use fields 'LOGGER', 'INIT_SCRIPT', 'PID_FILES', 'PROCESS_NAMES', 'DESCRIPTION', 'CAN_DISABLE', 'REGULAR_RESTART', 'PACKAGE_NAMES', 'SYSTEMD_SERVICES';
use RPM2;

sub new {
my ( $package ) = @_;
Expand Down Expand Up @@ -47,27 +46,43 @@ sub init {

sub package_version {
my ($self) = @_;

my $version;
if ($self->{PACKAGE_NAMES}) {
my $min;

my sub command_exists {
my ($cmd) = @_;
return !system("which $cmd > /dev/null 2>&1");
}

if (command_exists('rpm')) {
eval { require RPM2; };
my $min;
if (my $db = RPM2->open_rpm_db()) {
foreach my $package_name (@{ $self->{PACKAGE_NAMES} }) {
my @packages = $db->find_by_name($package_name);

foreach my $package (@packages) {
$min = $package unless $min;

my $result = ($package <=> $min);
if ($result < 0) {
$min = $package;
}
}
}
}

$version = $min->version."-".$min->release if $min;
$version = $min->version . "-" . $min->release if $min;
}
elsif (command_exists('dpkg')) {
eval { require Dpkg::Version; Dpkg::Version->import(qw(dpkg_version_compare)); };
my $min_version;
foreach my $package_name (@{ $self->{PACKAGE_NAMES} }) {
my $current_version = `dpkg-query -W -f='\${Version}' $package_name 2>/dev/null`;
chomp $current_version;
if ($current_version) {
if (!defined $min_version || dpkg_version_compare($current_version, $min_version) < 0) {
$min_version = $current_version;
}
}
}
$version = $min_version;
}

return $version;
Expand Down
30 changes: 21 additions & 9 deletions libperfsonar/libperfsonar/lib/perfSONAR_PS/Web/Sidebar.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ use Time::HiRes qw( time );
use Params::Validate;
use Data::Dumper;

use RPM2;

use perfSONAR_PS::NPToolkit::Config::AdministrativeInfo;

use perfSONAR_PS::NPToolkit::Services::ServicesMap qw(get_service_object);
Expand All @@ -36,15 +34,29 @@ sub set_sidebar_vars {
$vars->{ntp_nav_class} = "warning" unless $ntpinfo->is_synced();

my $cacti_available;
# TODO-debian: this will need a patch
if (my $db = RPM2->open_rpm_db()) {
my @packages = $db->find_by_name("cacti");

$cacti_available = 1 if scalar(@packages) > 0;

my sub command_exists {
my ($cmd) = @_;
return !system("which $cmd > /dev/null 2>&1");
}

if (command_exists('rpm')) {
eval { require RPM2; };

if (my $db = RPM2->open_rpm_db()) {
my @packages = $db->find_by_name("cacti");

$cacti_available = 1 if scalar(@packages) > 0;
}

$vars->{cacti_available} = $cacti_available;
}
elsif (command_exists('dpkg')) {
if ( system("dpkg -s cacti > /dev/null 2>&1") == 0 ) {
$cacti_available = 1;
}
}

$vars->{cacti_available} = $cacti_available;

return $vars;

}
Expand Down