From mboxrd@z Thu Jan 1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 01/10] pakfire: Refactor dblist seperating UI and logic
Date: Thu, 28 Jul 2022 13:21:27 +0200
Message-ID: <20220728112136.30218-2-robin.roevens@disroot.org>
In-Reply-To: <20220728112136.30218-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1013990926209419714=="
List-Id: <development.lists.ipfire.org>
--===============1013990926209419714==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
- Removed UI code from dblist function and refactor it making it return
a hash representing the pak db for easier handling of this data.
- Moved core update check in dblist to new seperate dbcoreinfo function
making it return a hash with current and possibly available core
version info.
- Update existing calls to dblist
- Bring UI parts previously in dblist to pakfire program itself,
pakfire.cgi and index.cgi with a few small enhancements:
- Translations for 'Core-Update', 'Release', 'Update' and 'Version'
- Add currently installed version numbers to installed paks list in
pakfire.cgi
- Add 'Installed: yes/no' to pakfire list output so people not using
colors have this information too. (Partly fixes Bug #12868)
- Add update available details to pakfire list output if package has
updates available.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
html/cgi-bin/index.cgi | 6 +-
html/cgi-bin/pakfire.cgi | 23 ++++-
langs/de/cgi-bin/de.pl | 4 +
langs/en/cgi-bin/en.pl | 4 +
langs/fr/cgi-bin/fr.pl | 4 +
langs/nl/cgi-bin/nl.pl | 4 +
src/pakfire/lib/functions.pl | 165 ++++++++++++++++++-----------------
src/pakfire/pakfire | 99 ++++++++++++++++-----
8 files changed, 202 insertions(+), 107 deletions(-)
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 18c26942e..6fecae1ff 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -604,7 +604,11 @@ if ($warnmessage) {
&Header::closebox();
}
=20
-&Pakfire::dblist("upgrade", "notice");
+my %coredb =3D &Pakfire::coredbinfo();
+if (defined $coredb{'AvailableRelease'}) {
+ print "<br /><br /><br /><a href=3D'pakfire.cgi'>$Lang::tr{'core notice 1'}=
$coredb{'Release'} $Lang::tr{'core notice 2'} $coredb{'AvailableRelease'} $L=
ang::tr{'core notice 3'}</a>";
+}
+
if ( -e "/var/run/need_reboot" ) {
print "<div style=3D'text-align:center; color:red;'>";
print "<br/><br/>$Lang::tr{'needreboot'}!";
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 3e8dc5460..cb1272c63 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -403,7 +403,16 @@ print <<END;
<select name=3D"UPDPAKS" class=3D"pflist" size=3D"5" disabled>
END
=20
- &Pakfire::dblist("upgrade", "forweb");
+ my %coredb =3D &Pakfire::coredbinfo();
+ if (defined $coredb{'AvailableRelease'}) {
+ print "<option value=3D\"core\">$Lang::tr{'core update'} -- $coredb{'CoreV=
ersion'} -- $Lang::tr{'release'}: $coredb{'Release'} -> $coredb{'AvailableRel=
ease'}</option>\n";
+ }
+
+ my %upgradelist =3D &Pakfire::dblist("upgrade");
+ foreach my $pak (sort keys %upgradelist) {
+ print "<option value=3D\"$pak\">$Lang::tr{'pak update'}: $pak -- $Lang::tr=
{'version'}: $upgradelist{$pak}{'ProgVersion'} -> $upgradelist{$pak}{'Availab=
leProgVersion'} -- $Lang::tr{'release'}: $upgradelist{$pak}{'Release'} -> $up=
gradelist{$pak}{'AvailableRelease'}</option>\n";
+ }
+
print <<END;
</select>
<input type=3D'hidden' name=3D'ACTION' value=3D'upgrade' />
@@ -419,7 +428,11 @@ END
<select name=3D"INSPAKS" class=3D"pflist" size=3D"10" multiple>
END
=20
- &Pakfire::dblist("notinstalled", "forweb");
+ my %notinstalledlist =3D &Pakfire::dblist("notinstalled");
+ foreach my $pak (sort keys %notinstalledlist) {
+ print "<option value=3D\"$pak\">$pak-$notinstalledlist{$pak}{'ProgVersion'=
}-$notinstalledlist{$pak}{'Release'}</option>\n";
+ }
+
print <<END;
</select>
<input type=3D'hidden' name=3D'ACTION' value=3D'install' />
@@ -431,7 +444,11 @@ END
<select name=3D"DELPAKS" class=3D"pflist" size=3D"10" multiple>
END
=20
- &Pakfire::dblist("installed", "forweb");
+ my %installedlist =3D &Pakfire::dblist("installed");
+ foreach my $pak (sort keys %installedlist) {
+ print "<option value=3D\"$pak\">$pak-$installedlist{$pak}{'ProgVersion'}-$=
installedlist{$pak}{'Release'}</option>\n";
+ }
+
print <<END;
</select>
<input type=3D'hidden' name=3D'ACTION' value=3D'remove' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 49c582a1e..179980716 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -653,6 +653,7 @@
'core notice 1' =3D> '<strong>Hinweis:</strong> Es steht eine Aktualisierung=
von Core-Update',
'core notice 2' =3D> 'auf',
'core notice 3' =3D> 'zur Verf=C3=BCgung.',
+'core update' =3D> 'Core-Update',
'could not be opened' =3D> 'konnte nicht ge=C3=B6ffnet werden',
'could not connect to' =3D> 'Konnte keine Verbindung herstellen mit',
'could not connect to www ipcop org' =3D> 'Keine Verbindung zu www.ipcop.org=
m=C3=B6glich',
@@ -2012,6 +2013,7 @@
'ovpnsys log' =3D> 'OVPN-System-Protokoll',
'package failed to install' =3D> 'Programmpaket konnte nicht installiert wer=
den.',
'pagerefresh' =3D> 'Seite wird aktualisiert. Bitte warten.',
+'pak update' =3D> 'Paketupdate',
'pakfire accept all' =3D> 'M=C3=B6chten Sie der Installation aller Pakete zu=
stimmen?',
'pakfire ago' =3D> 'her.',
'pakfire already busy' =3D> 'Pakfire f=C3=BChrt bereits eine Aufgabe aus. Bi=
tte versuchen Sie es sp=C3=A4ter erneut.',
@@ -2157,6 +2159,7 @@
'refresh index page while connected' =3D> 'Aktualisiere index.cgi Seite w=C3=
=A4hrend der Verbindung',
'refresh update list' =3D> 'Aktualisiere Update-Liste',
'registered user rules' =3D> 'Talos VRT-Regelsatz f=C3=BCr registrierte Benu=
tzer',
+'release' =3D> 'Release',
'released' =3D> 'Freigegeben',
'reload' =3D> 'neu laden',
'remark' =3D> 'Anmerkung',
@@ -2868,6 +2871,7 @@
'valid till' =3D> 'G=C3=BCltig bis',
'vci number' =3D> 'VCI-Nummer:',
'vendor' =3D> 'Hersteller',
+'version' =3D> 'Version',
'view log' =3D> 'Protokoll anzeigen',
'virtual address' =3D> 'Virtuelle Addresse',
'virtual private networking' =3D> 'Virtuelles Privates Netzwerk',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ae233de8e..b51823177 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -684,6 +684,7 @@
'core notice 1' =3D> '<strong>Notice:</strong> There is a core-update from',
'core notice 2' =3D> 'to',
'core notice 3' =3D> 'available.',
+'core update' =3D> 'Core-Update',
'could not be opened' =3D> 'could not be opened.',
'could not connect to' =3D> 'Could not connect to',
'could not connect to www ipcop org' =3D> 'Could not connect to www.ipfire.o=
rg',
@@ -2065,6 +2066,7 @@
'ovpnsys log' =3D> 'OVPN-System-Log',
'package failed to install' =3D> 'Package failed to install.',
'pagerefresh' =3D> 'Page is beeing refreshed, please wait.',
+'pak update' =3D> 'Update',
'pakfire accept all' =3D> 'Do you want to install all packages?',
'pakfire ago' =3D> 'ago.',
'pakfire already busy' =3D> 'Pakfire is already performing a task. Please tr=
y again later.',
@@ -2211,6 +2213,7 @@
'refresh index page while connected' =3D> 'Refresh index.cgi page while conn=
ected',
'refresh update list' =3D> 'Refresh update list',
'registered user rules' =3D> 'Talos VRT rules for registered users',
+'release' =3D> 'Release',
'released' =3D> 'Released',
'reload' =3D> 'reload',
'remark' =3D> 'Remark',
@@ -2935,6 +2938,7 @@
'valid till' =3D> 'Valid till',
'vci number' =3D> 'VCI number:',
'vendor' =3D> 'Vendor',
+'version' =3D> 'Version',
'view log' =3D> 'view log',
'virtual address' =3D> 'Virtual Address',
'virtual private networking' =3D> 'Virtual Private Networking',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 245ec62b6..560b4aa54 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -690,6 +690,7 @@
'core notice 1' =3D> '<strong>Remarque :</strong> Une mise =C3=A0 jour est d=
isponible depuis la version',
'core notice 2' =3D> 'vers',
'core notice 3' =3D> '',
+'core update' =3D> 'Mise =C3=A0 jour du coeur',
'could not be opened' =3D> 'ne peut pas =C3=AAtre ouvert',
'could not connect to' =3D> 'Impossible de se connecter =C3=A0',
'could not connect to www ipcop org' =3D> 'Impossible de se connecter =C3=A0=
www.ipcop.org',
@@ -2074,6 +2075,7 @@
'ovpnsys log' =3D> 'Journal syst=C3=A8me OVPN',
'package failed to install' =3D> 'L\'installation du paquet a =C3=A9chou=C3=
=A9.',
'pagerefresh' =3D> 'La page est en cours d\'actualisation, veuillez patiente=
r.',
+'pak update' =3D> 'Mise =C3=A0 jour',
'pakfire accept all' =3D> 'Voulez-vous installer ce(s) paquet(s) ?',
'pakfire ago' =3D> '',
'pakfire already busy' =3D> 'Pakfire est d=C3=A9j=C3=A0 en train d\'effectue=
r une t=C3=A2che. Veuillez r=C3=A9essayer plus tard.',
@@ -2221,6 +2223,7 @@
'refresh index page while connected' =3D> 'Actualiser la page index.cgi pend=
ant la connexion',
'refresh update list' =3D> 'Actualiser la liste des mises =C3=A0 jour',
'registered user rules' =3D> 'R=C3=A8gles Sourcefire VRT pour les utilisateu=
rs enregistr=C3=A9s',
+'release' =3D> 'R=C3=A9vision',
'released' =3D> 'Disponible',
'reload' =3D> 'Recharger',
'remark' =3D> 'Remarque ',
@@ -2946,6 +2949,7 @@
'valid till' =3D> 'Valide jusqu\'au',
'vci number' =3D> 'Nombre VCI :',
'vendor' =3D> 'Vendeur',
+'version' =3D> 'Version',
'view log' =3D> 'Afficher log',
'virtual address' =3D> 'Adresse virtuelle',
'virtual private networking' =3D> 'R=C3=A9seau priv=C3=A9 virtuel (VPN)',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 5979873bb..e50a95578 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -577,6 +577,7 @@
'core notice 1' =3D> '<strong>Let op:</strong> Er is een core-update van',
'core notice 2' =3D> 'naar',
'core notice 3' =3D> 'beschikbaar.',
+'core update' =3D> 'Core-Update',
'could not be opened' =3D> 'kan niet worden geopend.',
'could not connect to' =3D> 'Kan niet verbinden',
'could not connect to www ipcop org' =3D> 'Kan niet verbinden met www.ipfire=
.org',
@@ -1690,6 +1691,7 @@
'ovpnsys log' =3D> 'OVPN-Systeem-Log',
'package failed to install' =3D> 'Pakket kon niet worden ge=C3=AFnstalleerd.=
',
'pagerefresh' =3D> 'Pagina wordt ververst, wacht even a.u.b.',
+'pak update' =3D> 'Opwaardering',
'pakfire accept all' =3D> 'Wilt u alle pakketten installeren?',
'pakfire ago' =3D> 'geleden.',
'pakfire available addons' =3D> 'Beschikbare extensies:',
@@ -1817,6 +1819,7 @@
'refresh index page while connected' =3D> 'Ververs de index.cgi pagina terwi=
jl verbonden',
'refresh update list' =3D> 'Ververs update-lijst',
'registered user rules' =3D> 'Talos VRT regels voor geregistreerde gebruiker=
s',
+'release' =3D> 'Uitgave',
'released' =3D> 'Released',
'reload' =3D> 'herlaad',
'remark' =3D> 'Opmerking',
@@ -2484,6 +2487,7 @@
'valid root certificate already exists' =3D> 'Er bestaat al een geldig root =
certificaat.',
'valid till' =3D> 'Geldig tot',
'vci number' =3D> 'VCI nummer:',
+'version' =3D> 'Versie',
'view log' =3D> 'bekijk log',
'virtual address' =3D> 'Virtueel adres',
'virtual private networking' =3D> 'Virtual Private Networking',
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 505988af9..19160503e 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -44,7 +44,7 @@ my @VALID_KEY_FINGERPRINTS =3D (
);
=20
# A small color-hash :D
-my %color;
+our %color;
$color{'normal'} =3D "\033[0m";
$color{'black'} =3D "\033[0;30m";
$color{'darkgrey'} =3D "\033[1;30m";
@@ -434,108 +434,113 @@ sub dbgetlist {
}
}
=20
+sub coredbinfo {
+ ### This subroutine returns core db version information in a hash.
+ # Usage is without arguments
+
+ eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
+
+ my %coredb =3D (
+ CoreVersion =3D> $Conf::version,
+ Release =3D> $Conf::core_mine,
+ );
+
+ $coredb{'AvailableRelease'} =3D $core_release if ("$Conf::core_mine" < "$co=
re_release");
+
+ return %coredb;
+}
+
sub dblist {
- ### This subroutine lists the packages.
- # You may also pass a filter: &Pakfire::dblist(filter)
- # Usage is always with two arguments.
- # filter may be: all, notinstalled, installed
+ ### This subroutine returns the packages from the packages_list db in a has=
h.
+ # It uses the currently cached version of packages_list. To ensure latest=
=20
+ # data, run Pakfire::dbgetlist first.
+ # You may also pass a filter: &Pakfire::dblist(filter)=20
+ # Usage is always with one argument.
+ # filter may be:=20
+ # - "all": list all known paks,
+ # - "notinstalled": list only not installed paks,
+ # - "installed": list only installed paks
+ # - "upgrade": list only upgradable paks
+ #
+ # Returned hash format:
+ # ( "<pak name>" =3D> (
+ # "Installed" =3D> "Yes" or "No" wether the pak is installed,
+ # "ProgVersion" =3D> Installed program version when "Installed" =3D> =
"Yes" or
+ # Available version when "Installed" =3D> No,
+ # "Release" =3D> Installed pak release number when "Installed" =3D> "=
Yes" or
+ # Available pak release number when "Installed" =3D> =
No,
+ # "AvailableProgVersion" =3D> Available program version.=20
+ # Only defined if an upgrade to a higher ve=
rsion is available,
+ # "AvailableRelease" =3D> Available pak release version.=20
+ # Only defined if an upgrade to a higher versio=
n is available
+ # ),
+ # ...=09
+ # )
+=09
my $filter =3D shift;
- my $forweb =3D shift;
- my @updatepaks;
+ my %paklist =3D ();
my $file;
my $line;
- my $prog;
my %metadata;
my @templine;
-
- ### Make sure that the list is not outdated.
- #dbgetlist("noforce");
-
+=09
open(FILE, "<$Conf::dbdir/lists/packages_list.db");
my @db =3D <FILE>;
close(FILE);
=20
- if ("$filter" eq "upgrade") {
- if ("$forweb" ne "forweb" && "$forweb" ne "notice" ) {getcoredb("noforce")=
;}
- eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
- if ("$core_release" > "$Conf::core_mine") {
- if ("$forweb" eq "forweb") {
- print "<option value=3D\"core\">Core-Update -- $Conf::version -- Release=
: $Conf::core_mine -> $core_release</option>\n";
- }
- elsif ("$forweb" eq "notice") {
- print "<br /><br /><br /><a href=3D'pakfire.cgi'>$Lang::tr{'core notice =
1'} $Conf::core_mine $Lang::tr{'core notice 2'} $core_release $Lang::tr{'core=
notice 3'}</a>";
- } else {
- my $command =3D "Core-Update $Conf::version\nRelease: $Conf::core_mine -=
> $core_release\n";
- if ("$Pakfire::enable_colors" eq "1") {
- print "$color{'lila'}$command$color{'normal'}\n";
- } else {
- print "$command\n";
- }
- }
- }
-
+ if ("$filter" ne "notinstalled") {
opendir(DIR,"$Conf::dbdir/installed");
my @files =3D readdir(DIR);
closedir(DIR);
+
foreach $file (@files) {
next if ( $file eq "." );
next if ( $file eq ".." );
next if ( $file =3D~ /^old/ );
%metadata =3D parsemetafile("$Conf::dbdir/installed/$file");
=20
- foreach $prog (@db) {
- @templine =3D split(/\;/,$prog);
- if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" <=
"$templine[2]" && "$forweb" ne "notice")) {
- push(@updatepaks,$metadata{'Name'});
- if ("$forweb" eq "forweb") {
- print "<option value=3D\"$metadata{'Name'}\">Update: $metadata{'Name'}=
-- Version: $metadata{'ProgVersion'} -> $templine[1] -- Release: $metadata{'=
Release'} -> $templine[2]</option>\n";
- } else {
- my $command =3D "Update: $metadata{'Name'}\nVersion: $metadata{'ProgVe=
rsion'} -> $templine[1]\nRelease: $metadata{'Release'} -> $templine[2]\n";
- if ("$Pakfire::enable_colors" eq "1") {
- print "$color{'lila'}$command$color{'normal'}\n";
- } else {
- print "$command\n";
- }
- }
+ foreach $line (@db) {
+ next unless ($line =3D~ /.*;.*;.*;/ );
+ @templine =3D split(/\;/,$line);
+ if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" <=
"$templine[2]")) {
+ # Add all upgradable paks to list
+ $paklist{"$metadata{'Name'}"} =3D {
+ ProgVersion =3D> $metadata{'ProgVersion'},
+ Release =3D> $metadata{'Release'},
+ AvailableProgVersion =3D> $templine[1],
+ AvailableRelease =3D> $templine[2],
+ Installed =3D> "yes"
+ };
+ last;
+ } elsif (("$metadata{'Name'}" eq "$templine[0]") && ("$filter" ne "upgra=
de")) {
+ # Add installed paks without an upgrade available to list
+ $paklist{"$metadata{'Name'}"} =3D {
+ ProgVersion =3D> $metadata{'ProgVersion'},
+ Release =3D> $metadata{'Release'},
+ Installed =3D> "yes"
+ };
+ last;
}
}
}
- return @updatepaks;
- } else {
- my $line;
- my $use_color;
- my @templine;
- my $count;
- foreach $line (sort @db) {
+ }
+
+ # Add all not installed paks to list
+ if (("$filter" ne "upgrade") && ("$filter" ne "installed")) {
+ foreach $line (@db) {
next unless ($line =3D~ /.*;.*;.*;/ );
- $use_color =3D "";
@templine =3D split(/\;/,$line);
- if ("$filter" eq "notinstalled") {
- next if ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
- } elsif ("$filter" eq "installed") {
- next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
- }
- $count++;
- if ("$forweb" eq "forweb")
- {
- if ("$filter" eq "notinstalled") {
- print "<option value=3D\"$templine[0]\">$templine[0]-$templine[1]-$temp=
line[2]</option>\n";
- } else {
- print "<option value=3D\"$templine[0]\">$templine[0]</option>\n";
- }
- } else {
- if ("$Pakfire::enable_colors" eq "1") {
- if (&isinstalled("$templine[0]")) {
- $use_color =3D "$color{'red'}"
- } else {
- $use_color =3D "$color{'green'}"
- }
- }
- print "${use_color}Name: $templine[0]\nProgVersion: $templine[1]\nReleas=
e: $templine[2]$color{'normal'}\n\n";
- }
+ next if ((defined $paklist{"$templine[0]"}) || (&isinstalled($templine[0]=
) =3D=3D 0));
+
+ $paklist{"$templine[0]"} =3D {
+ ProgVersion =3D> "$templine[1]",
+ Release =3D> "$templine[2]",
+ Installed =3D> "no"
+ };
}
- print "$count packages total.\n" unless ("$forweb" eq "forweb");
}
+
+ return %paklist;
}
=20
sub resolvedeps_one {
@@ -910,10 +915,10 @@ sub progress_bar {
=20
sub updates_available {
# Get packets with updates available
- my @upgradepaks =3D &Pakfire::dblist("upgrade", "noweb");
+ my %upgradepaks =3D &Pakfire::dblist("upgrade");
=20
- # Get the length of the returned array
- my $updatecount =3D scalar @upgradepaks;
+ # Get the length of the returned hash
+ my $updatecount =3D keys %upgradepaks;
=20
return "$updatecount";
}
diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 6c77695c8..b4930e85d 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -270,14 +270,25 @@
&Pakfire::getcoredb("$force");
=20
} elsif ("$ARGV[0]" eq "upgrade") {
+ my $use_color =3D "";
+ my $reset_color =3D "";
+
+ if ("$Pakfire::enable_colors" eq "1") {
+ $reset_color =3D "$Pakfire::color{'normal'}";
+ $use_color =3D "$Pakfire::color{'lightpurple'}";
+ }
+
&Pakfire::upgradecore();
- my @upgradepaks =3D &Pakfire::dblist("upgrade", "noweb");
+ =09
my @deps =3D ();
-
- if (@upgradepaks) {
+ if (my %upgradepaks =3D &Pakfire::dblist("upgrade")) {
# Resolve the dependencies of the to be upgraded packages
- @deps =3D &Pakfire::resolvedeps_recursive(@upgradepaks);
+ @deps =3D &Pakfire::resolvedeps_recursive(keys %upgradepaks);
=20
+ foreach $pak (sort keys %upgradepaks) {
+ print "${use_color}Update: $pak\nVersion: $upgradepaks{$pak}{'ProgVersio=
n'} -> $upgradepaks{$pak}{'AvailableProgVersion'}\n";
+ print "Release: $upgradepaks{$pak}{'Release'} -> $upgradepaks{$pak}{'Ava=
ilableRelease'}${reset_color}\n";
+ }
&Pakfire::message("");
&Pakfire::message("PAKFIRE UPGR: We are going to install all packages lis=
ted above.");
if ($interactive) {
@@ -290,36 +301,78 @@
exit 1;
}
}
- }
+ =09
+ # Download packages
+ foreach $pak (sort keys %upgradepaks) {
+ &Pakfire::getpak("$pak", "");
+ }
=20
- # Download packages
- foreach $pak (@upgradepaks) {
- &Pakfire::getpak("$pak", "");
+ # Download dependencies
+ foreach $pak (@deps) {
+ &Pakfire::getpak("$pak", "");
+ }
+
+ # Install dependencies first
+ foreach $pak (@deps) {
+ &Pakfire::setuppak("$pak");
+ }
+
+ # Install all upgrades
+ foreach $pak (sort keys %upgradepaks) {
+ &Pakfire::upgradepak("$pak");
+ }
+ } else {
+ &Pakfire::message("PAKFIRE WARN: No new package upgrades available.");
}
=20
- # Download dependencies
- foreach $pak (@deps) {
- &Pakfire::getpak("$pak", "");
+ } elsif ("$ARGV[0]" eq "list") {
+ my $count;
+ my $use_color =3D "";
+ my $reset_color =3D "";
+ my $filter =3D "all";
+
+ if ("$ARGV[1]" =3D~ /installed|notinstalled/) {
+ $filter =3D "$ARGV[1]";
+ } else {
+ &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[=
1]);=20
}
=20
- # Install dependencies first
- foreach $pak (@deps) {
- &Pakfire::setuppak("$pak");
+ my $pak;
+ my %paklist =3D &Pakfire::dblist($filter);
+
+ if ("$Pakfire::enable_colors" eq "1") {
+ $reset_color =3D "$Pakfire::color{'normal'}";
+ $use_color =3D "$Pakfire::color{'lightgreen'}";
}
=20
- # Install all upgrades
- foreach $pak (@upgradepaks) {
- &Pakfire::upgradepak("$pak");
+ foreach $pak (sort keys %paklist) {
+ if ("$Pakfire::enable_colors" eq "1") {
+ if ("$paklist{$pak}{'Installed'}" eq "yes") {
+ if (defined $paklist{$pak}{'AvailableProgVersion'}) {
+ $use_color =3D "$Pakfire::color{'lightgreen'}";
+ } else {
+ $use_color =3D "$Pakfire::color{'green'}";
+ }
+ } else {
+ $use_color =3D "$Pakfire::color{'red'}";=20
+ }
+ }
+
+ print "${use_color}Name: $pak\nProgVersion: $paklist{$pak}{'ProgVersion'}=
\n";
+ print "Release: $paklist{$pak}{'Release'}\nInstalled: $paklist{$pak}{'Ins=
talled'}\n";
+ if (defined $paklist{$pak}{'AvailableProgVersion'}) {
+ print "Update available:\n Version: $paklist{$pak}{'ProgVersion'} -> $pa=
klist{$pak}{'AvailableProgVersion'}\n Release: $paklist{$pak}{'Release'} -> $=
paklist{$pak}{'AvailableRelease'}\n";
+ }
+ print "${reset_color}\n";
+ =09
}
=20
- } elsif ("$ARGV[0]" eq "list") {
- if ("$ARGV[1]" =3D~ /installed|notinstalled/) {
- &Pakfire::dblist("$ARGV[1]", "noweb");
+ $count =3D keys %paklist;
+ if ($count > 0) {
+ print "$count packages total.\n";
} else {
- &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[=
1]);
- &Pakfire::dblist("all", "noweb");
+ &Pakfire::message("PAKFIRE WARN: No packages where found using filter $fi=
lter.");
}
-
} elsif ("$ARGV[0]" eq "resolvedeps") {
foreach (@ARGV) {
next if ("$_" eq "resolvedeps");
--=20
2.36.1
--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.
--===============1013990926209419714==--