Die Abhaengigkeitspakete vom Samba erstellt.

[ipfire-2.x.git] / src / pakfire / pakfire

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 75d7fd6ad27e51a877a698484e89879a3119bd27..d2b0d9a010b8c2061e14896b75c32dccb535a2fd 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -24,13 +24,18 @@
 
        if ("$ARGV[0]" eq "install") {
                shift;
-               my @deps = ();
-               my @paks = @ARGV;
+               my @deps;
+               my @paks;
+               my @temp;
                foreach (@ARGV) {
-                       @deps = &Pakfire::resolvedeps("$_");
+                       push(@paks,$_);
+               }
+               foreach (@paks) {
+                       @temp = &Pakfire::resolvedeps("$_");
+                       foreach (@temp) { push(@deps,$_) if $_; }
                }
                
-               my @all = ();
+               my @all;
                foreach (@paks) {
                  push(@all,$_);
                }
@@ -39,20 +44,20 @@
                }
 
                &Pakfire::message("\n\n### Packages to install:");
-               foreach (@paks) {
+               foreach (sort @paks) {
                  my $size = &Pakfire::getsize("$_");
                        $size = &Pakfire::beautifysize($size);
                  &Pakfire::message("# $_  \t\t - $size");
                }
                
                &Pakfire::message("\n### Packages to install for dependencies:");
-               foreach (@deps) {
+               foreach (sort @deps) {
                  my $size = &Pakfire::getsize("$_");
                        $size = &Pakfire::beautifysize($size);
                  &Pakfire::message("# $_  \t\t - $size");
                }
 
-               my $totalsize = &Pakfire::addsizes(@all);
+               my $totalsize = &Pakfire::addsizes("@all");
                $totalsize = &Pakfire::beautifysize($totalsize);
                &Pakfire::message("\n### Download size: \t ~ $totalsize");
                
@@ -68,8 +73,16 @@
                }
                
                &Pakfire::message("### Installing all packages:");
+               foreach (sort @all) { &Pakfire::message("# --> $_"); }
+               &Pakfire::message("");
+
+               ### Download first
+               foreach (sort @all) {
+                       &Pakfire::message("# --> Downloading: $_");
+                       &Pakfire::getpak("$_", "");
+               }
 
-               foreach (@all) {
+               foreach (sort @all) {
                        &Pakfire::setuppak("$_");
                }