X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fpakfire%2Fpakfire;h=cdf0b619c3bb8574a1d8dc625149c2af33fe6dc1;hp=5c5dd6b38ffe0f486733fc20da67ce84e3d634c3;hb=4b122800545ee8864b4dd9d4cfed7f247ba414d5;hpb=5b2a12ff8ad39591a5a57a0f2122edc2934f5ec3

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 5c5dd6b38f..cdf0b619c3 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -5,6 +5,7 @@
 	my $interactive = 1;
 	
 	&Pakfire::logger("### IPFire Pakfire $Conf::version started!");
+	&Pakfire::checkcryptodb;
 
 	### Check if we are running as root
 	#
@@ -18,6 +19,13 @@
 	unless (@ARGV) {
 		&Pakfire::usage;
 	}
+	
+	foreach (@ARGV) {
+		if ("$_" =~ "^-") {
+			$interactive = 0 if ("$_" eq "--non-interactive");
+			$interactive = 0 if ("$_" eq "-y");
+		}
+	}
 
 	if ("$ARGV[0]" eq "install") {
 		&Pakfire::lock("on");
@@ -25,24 +33,23 @@
 		my @deps;
 		my @paks;
 		my @temp;
+		my @all;
 		foreach (@ARGV) {
-			if ("$_" =~ "^--") {
-				$interactive = 0 if ("$_" eq "--non-interactive");
-			} else {
-				push(@paks,$_);
+			unless ("$_" =~ "^-") {
+				push(@paks,$_) if $_;
 			}
 		}
+		
 		foreach (@paks) {
 			@temp = &Pakfire::resolvedeps("$_");
 			foreach (@temp) { push(@deps,$_) if $_; }
 		}
 		
-		my @all;
 		foreach (@paks) {
-		  push(@all,$_);
+		  push(@all,$_) if $_;
 		}
 		foreach (@deps) {
-		  push(@all,$_);
+		  push(@all,$_) if $_;
 		}
 
 		&Pakfire::message("\n\n### Packages to install:");
@@ -52,16 +59,19 @@
 		  &Pakfire::message("# $_  \t\t - $size");
 		}
 		
-		&Pakfire::message("\n### Packages to install for dependencies:");
+		&Pakfire::message("\n### Packages to install for dependencies:") if @deps;
 		foreach (sort @deps) {
 		  my $size = &Pakfire::getsize("$_");
 			$size = &Pakfire::beautifysize($size);
 		  &Pakfire::message("# $_  \t\t - $size");
 		}
-
-		my $totalsize = &Pakfire::addsizes("@all");
+		
+		my $totalsize;
+		foreach (@all) {
+			$totalsize = ($totalsize + &Pakfire::getsize("$_"));
+		}
 		$totalsize = &Pakfire::beautifysize($totalsize);
-		&Pakfire::message("\n### Download size: \t ~ $totalsize");
+		&Pakfire::message("\n### Total size: \t ~ $totalsize\n");
 		
 		if ($interactive) {
 		  &Pakfire::message("Is this okay? [y/N]");
@@ -96,6 +106,10 @@
 		$force = "force" if ("$ARGV[1]" eq "--force");
 		&Pakfire::dbgetlist("$force");
 		
+	
+	} elsif ("$ARGV[0]" eq "upgrade") {
+		&Pakfire::dblist("upgrade", "noweb");
+		
 	} elsif ("$ARGV[0]" eq "list") {
 		&Pakfire::dblist("all", "noweb");