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

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index cdf0b619c3..9768836ea5 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -3,8 +3,9 @@
 	require "/opt/pakfire/lib/functions.pl";
 	
 	my $interactive = 1;
+	my $force = "noforce";
 	
-	&Pakfire::logger("### IPFire Pakfire $Conf::version started!");
+	&Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!");
 	&Pakfire::checkcryptodb;
 
 	### Check if we are running as root
@@ -12,113 +13,273 @@
 	my $user = qx(whoami);
 	chomp($user);
 	unless ( "$user" eq "root" ) {
-	  &Pakfire::message("You must run pakfire as user root!");
+	  &Pakfire::message("PAKFIRE ERROR: You must run pakfire as user root!");
 	  exit 1;
 	}
 	
+	unless ( -e "/var/ipfire/red/active" ) {
+		&Pakfire::message("PAKFIRE ERROR: You need to be online to run pakfire!");
+		exit 2;
+	}
+	
+	### Check if we are started by another name
+	#
+	if ( $0 =~ /pakfire-update$/ ) {
+		&Pakfire::message("CRON INFO: Running an update");
+		$ARGV[0] = "update";
+		$interactive = 0;
+	} elsif ( $0 =~ /pakfire-upgrade$/ ) {
+		&Pakfire::message("CRON INFO: Running an upgrade");
+		$ARGV[0] = "upgrade";
+		$interactive = 0;
+	}
+	
 	unless (@ARGV) {
 		&Pakfire::usage;
 	}
 	
 	foreach (@ARGV) {
 		if ("$_" =~ "^-") {
+			# Turn off interactive mode
 			$interactive = 0 if ("$_" eq "--non-interactive");
 			$interactive = 0 if ("$_" eq "-y");
+			
+			# Turn off shell colors - Bad for displaying in webinterface
+			$Pakfire::enable_colors = 0 if ("$_" eq "--no-colors");
+			
+			# Turn on force mode
+			$force = "force" if ("$_" eq "-f" );
+			$force = "force" if ("$_" eq "--force" );
 		}
 	}
 
 	if ("$ARGV[0]" eq "install") {
-		&Pakfire::lock("on");
 		shift;
+		
+		### Make sure that the list is not outdated. 
+		&Pakfire::dbgetlist("noforce");
+
+		open(FILE, "<$Conf::dbdir/lists/packages_list.db");
+		my @db = <FILE>;
+		close(FILE);
+		
+		my $dep;
 		my @deps;
+		my $pak;
 		my @paks;
 		my @temp;
+		my @templine;
+		my $found = 0;
+		my $return;
 		my @all;
-		foreach (@ARGV) {
-			unless ("$_" =~ "^-") {
-				push(@paks,$_) if $_;
+		foreach $pak (@ARGV) {
+			unless ("$pak" =~ "^-") {
+				$return = &Pakfire::isinstalled($pak);
+				if ($return eq 0) {
+					&Pakfire::message("PAKFIRE INFO: $pak is already installed");
+					next; 
+				}
+				$found = 0;
+				foreach (@db) {
+					@templine = split(/;/,$_);
+					if ("$templine[0]" eq "$pak" ) {
+						push(@paks,$pak);
+						push(@all,$pak);
+						@temp = &Pakfire::resolvedeps("$pak");
+						foreach $dep (@temp) {
+							push(@deps,$dep) if $dep;
+							push(@all,$dep) if $dep;
+						}
+						$found = 1;
+						break;
+					}
+				}
+				if ($found == 0) {
+					&Pakfire::message("");
+					&Pakfire::message("PAKFIRE WARN: The pak \"$pak\" is not known. Please try running \"pakfire update\".");
+				}
 			}
 		}
 		
-		foreach (@paks) {
-			@temp = &Pakfire::resolvedeps("$_");
-			foreach (@temp) { push(@deps,$_) if $_; }
-		}
-		
-		foreach (@paks) {
-		  push(@all,$_) if $_;
-		}
-		foreach (@deps) {
-		  push(@all,$_) if $_;
+		unless (@paks) {
+			&Pakfire::message("PAKFIRE ERROR: No packages to install. Exiting...");
+			exit 1;
 		}
 
-		&Pakfire::message("\n\n### Packages to install:");
-		foreach (sort @paks) {
-		  my $size = &Pakfire::getsize("$_");
+		&Pakfire::message("");
+		&Pakfire::message("");
+		&Pakfire::message("PAKFIRE INFO: Packages to install:");
+		foreach $pak (sort @paks) {
+		  my $size = &Pakfire::getsize("$pak");
 			$size = &Pakfire::beautifysize($size);
-		  &Pakfire::message("# $_  \t\t - $size");
+		  &Pakfire::message("PAKFIRE INFO: $pak \t - $size");
 		}
 		
-		&Pakfire::message("\n### Packages to install for dependencies:") if @deps;
-		foreach (sort @deps) {
-		  my $size = &Pakfire::getsize("$_");
+		if (@deps) {
+			my %sort = map{ $_, 1 } @deps;
+			@deps = sort keys %sort;
+			&Pakfire::message("");
+			&Pakfire::message("PAKFIRE INFO: Packages to install for dependencies:");
+		}
+		foreach $dep (sort @deps) {
+		  my $size = &Pakfire::getsize("$dep");
 			$size = &Pakfire::beautifysize($size);
-		  &Pakfire::message("# $_  \t\t - $size");
+		  &Pakfire::message("PAKFIRE INFO: $dep \t - $size");
 		}
 		
 		my $totalsize;
-		foreach (@all) {
-			$totalsize = ($totalsize + &Pakfire::getsize("$_"));
+		foreach $pak (@all) {
+			$totalsize = ($totalsize + &Pakfire::getsize("$pak"));
 		}
 		$totalsize = &Pakfire::beautifysize($totalsize);
-		&Pakfire::message("\n### Total size: \t ~ $totalsize\n");
+		&Pakfire::message("");
+		&Pakfire::message("PAKFIRE INFO: Total size: \t ~ $totalsize");
+		&Pakfire::message("");
 		
 		if ($interactive) {
-		  &Pakfire::message("Is this okay? [y/N]");
+		  &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]");
 			my $ret = <STDIN>;
 			chomp($ret);
-			&Pakfire::logger("Answer: $ret");
+			&Pakfire::logger("PAKFIRE INFO: Answer: $ret");
 			if ( $ret ne "y" ) {
-			  &Pakfire::message("Installation aborted.");
+			  &Pakfire::message("PAKFIRE ERROR: Installation aborted.");
 			  exit 1;
 			}
+		} else {
+			&Pakfire::logger("PAKFIRE INFO: Interaction skipped.");
 		}
+		
+		my %sort = map{ $_, 1 } @all;
+		@all = sort keys %sort;
 
 		### Download first
-		foreach (sort @all) {
-			&Pakfire::message("# --> Downloading: $_");
-			&Pakfire::getpak("$_", "");
+		foreach $pak (sort @all) {
+			&Pakfire::getpak("$pak", "");
 		}
 
-		foreach (sort @all) {
-			&Pakfire::setuppak("$_");
+		&Pakfire::message("");
+
+		foreach $pak (sort @all) {
+			&Pakfire::setuppak("$pak") if ($pak ne "");
 		}
-		&Pakfire::lock("off");
 		
 	} elsif ("$ARGV[0]" eq "remove") {
+		shift;
+		
+		my @paks;
+		my $pak;
+		foreach $pak (@ARGV) {
+			unless ("$pak" =~ "^-") {
+				$return = &Pakfire::isinstalled($pak);
+				if ($return ne 0) {
+					&Pakfire::message("PAKFIRE WARN: $pak is not installed");
+					next;
+				}
+				push(@paks, $pak);
+			}
+		}
+		
+		unless (@paks) {
+			&Pakfire::message("PAKFIRE ERROR: No packages to remove. Exiting...");
+			exit 1;
+		}
+		
+		&Pakfire::message("");
+		&Pakfire::message("");
+		&Pakfire::message("PAKFIRE INFO: Packages to remove:");
+		foreach $pak (sort @paks) {
+		  my $size = &Pakfire::getsize("$pak");
+			$size = &Pakfire::beautifysize($size);
+		  &Pakfire::message("PAKFIRE INFO: $pak \t - $size");
+		}
+		
+		if ($interactive) {
+		  &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]");
+			my $ret = <STDIN>;
+			chomp($ret);
+			&Pakfire::logger("PAKFIRE INFO: Answer: $ret");
+			if ( $ret ne "y" ) {
+			  &Pakfire::message("PAKFIRE ERROR: Installation aborted.");
+			  exit 1;
+			}
+		}
+		
+		foreach $pak (@paks) {
+			&Pakfire::removepak("$pak");
+		}
 	
 	
 	} elsif ("$ARGV[0]" eq "update") {
-		my $force = "noforce";
 		&Pakfire::makeuuid();
 		&Pakfire::senduuid();
-		&Pakfire::getmirrors();
-		$force = "force" if ("$ARGV[1]" eq "--force");
+		&Pakfire::getmirrors("$force");
 		&Pakfire::dbgetlist("$force");
-		
-	
+		&Pakfire::getcoredb("$force");
+
 	} elsif ("$ARGV[0]" eq "upgrade") {
-		&Pakfire::dblist("upgrade", "noweb");
+		&Pakfire::upgradecore();
+		my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
+		my @temp;
+		
+		foreach (@upgradepaks) {
+			@temp = &Pakfire::resolvedeps("$_");
+			foreach (@temp) { push(@upgradepaks,$_) if $_; }
+		}
+		
+		if (@upgradepaks) {
+			&Pakfire::message("");
+			&Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above.");
+			if ($interactive) {
+			  &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]");
+				my $ret = <STDIN>;
+				chomp($ret);
+				&Pakfire::logger("PAKFIRE INFO: Answer: $ret");
+				if ( $ret ne "y" ) {
+				  &Pakfire::message("PAKFIRE ERROR: Installation aborted.");
+				  exit 1;
+				}
+			}
+		}
+		
+		### Download first
+		foreach (sort @upgradepaks) {
+			&Pakfire::getpak("$_", "");
+		}
+		
+		foreach (sort @upgradepaks) {
+			&Pakfire::upgradepak("$_");
+		}
 		
 	} elsif ("$ARGV[0]" eq "list") {
-		&Pakfire::dblist("all", "noweb");
+		if ("$ARGV[1]" =~ /installed|notinstalled/) {
+			&Pakfire::dblist("$ARGV[1]", "noweb");
+		} else {
+			&Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); 
+			&Pakfire::dblist("all", "noweb");
+		}
 		
 	} elsif ("$ARGV[0]" eq "resolvedeps") {
 		foreach (@ARGV) {
 			next if ("$_" eq "resolvedeps");
+			next if ("$_" =~ "^-");
 			&Pakfire::resolvedeps("$_");
 		}
-		
+	} elsif ("$ARGV[0]" eq "enable") {
+		if ("$ARGV[1]" eq "updates") {
+			system("ln -s ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update");
+		elsif ("$ARGV[1]" eq "upgrades") {
+			system("ln -s ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-upgrade");
+		}
+	} elsif ("$ARGV[0]" eq "disable") {
+		if ("$ARGV[1]" eq "updates") {
+			system("rm -f /etc/fcron.daily/pakfire-update");
+		elsif ("$ARGV[1]" eq "upgrades") {
+			system("rm -f /etc/fcron.daily/pakfire-upgrade");
+		}
 	} else {
 		&Pakfire::usage;
 	}
+
+&Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing.");
+
+exit 0;