[v2,07/10] pakfire: Refactor status seperating UI and logic
Commit Message
- Removed UI code from status function now returning hash with status
properties.
- Removed function coreupdate_available as it is now not used anymore
- Added UI code to pakfire status routine
- Added meaningfull exitcode to status:
- 2: Core update available
- 3: Pak update available
- 4: Reboot required
- Error codes can be added together: 2+3 = 5 means both core update
and pak update is available
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
---
src/pakfire/lib/functions.pl | 50 +++++++++++++++---------------------
src/pakfire/pakfire | 19 +++++++++++++-
2 files changed, 38 insertions(+), 31 deletions(-)
@@ -914,16 +914,6 @@ sub updates_available {
return "$updatecount";
}
-sub coreupdate_available {
- eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
- if ("$core_release" > "$Conf::core_mine") {
- return "yes ($core_release)";
- }
- else {
- return "no";
- }
-}
-
sub reboot_required {
if ( -e "/var/run/need_reboot" ) {
return "yes";
@@ -934,26 +924,26 @@ sub reboot_required {
}
sub status {
- # General info
- my $return = "Core-Version: $Conf::version\n";
- $return .= "Core-Update-Level: $Conf::core_mine\n";
- $return .= "Last update: " . &General::age("/opt/pakfire/db/core/mine") . " ago\n";
- $return .= "Last core-list update: " . &General::age("/opt/pakfire/db/lists/core-list.db") . " ago\n";
- $return .= "Last server-list update: " . &General::age("/opt/pakfire/db/lists/server-list.db") . " ago\n";
- $return .= "Last packages-list update: " . &General::age("/opt/pakfire/db/lists/packages_list.db") . " ago\n";
-
- # Get availability of core updates
- $return .= "Core-Update available: " . &Pakfire::coreupdate_available() . "\n";
-
- # Get availability of package updates
- $return .= "Package-Updates available: " . &Pakfire::updates_available() . "\n";
-
- # Test if reboot is required
- $return .= "Reboot required: " . &Pakfire::reboot_required() . "\n";
-
- # Return status text
- print "$return";
- exit 1;
+ ### This subroutine returns pakfire status information in a hash.
+ # Usage is without arguments
+
+ # Add core version info
+ my %status = &Pakfire::coredbinfo();
+
+ # Add last update info
+ $status{'LastUpdate'} = &General::age("/opt/pakfire/db/core/mine");
+ $status{'LastCoreListUpdate'} = &General::age("/opt/pakfire/db/lists/core-list.db");
+ $status{'LastServerListUpdate'} = &General::age("/opt/pakfire/db/lists/server-list.db");
+ $status{'LastPakListUpdate'} = &General::age("/opt/pakfire/db/lists/packages_list.db");
+
+ # Add number of available package updates
+ $status{'CoreUpdateAvailable'} = (defined $status{'AvailableRelease'}) ? "yes" : "no";
+ $status{'PakUpdatesAvailable'} = &Pakfire::updates_available();
+
+ # Add if reboot is required
+ $status{'RebootRequired'} = &Pakfire::reboot_required();
+
+ return %status;
}
sub get_arch() {
@@ -412,7 +412,24 @@
system("rm -f /etc/fcron.daily/pakfire-upgrade");
}
} elsif ("$ARGV[0]" eq "status") {
- &Pakfire::status;
+ my $exitcode = 0;
+ my %status = &Pakfire::status;
+
+ print "Core-Version: $status{'CoreVersion'}\n";
+ print "Core-Update-Level: $status{'Release'}\n";
+ print "Last update: $status{'LastUpdate'} ago\n";
+ print "Last core-list update: $status{'LastCoreListUpdate'} ago\n";
+ print "Last server-list update: $status{'LastServerListUpdate'} ago\n";
+ print "Last packages-list update: $status{'LastPakListUpdate'} ago\n";
+ print "Core-Update available: $status{'CoreUpdateAvailable'}";
+ print " ($status{'AvailableRelease'})" if ("$status{'CoreUpdateAvailable'}" eq "yes");
+ print "\nPackage-Updates available: $status{'PakUpdatesAvailable'}\n";
+ print "Reboot required: $status{'RebootRequired'}\n";
+
+ $exitcode += 2 if ($status{'CoreUpdateAvailable'} eq "yes");
+ $exitcode += 3 if ($status{'PakUpdatesAvailable'} eq "yes");
+ $exitcode += 4 if ($status{'RebootRequired'} eq "yes");
+ exit $exitcode;
} else {
&Pakfire::usage;
}