webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Die Farben im Pakfire sind nun abschaltbar.

Browse Source 
Hilfe erweitert.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@731 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-08-01 22:02:51 +00:00
parent 7bc1b6acae
commit 750c1528a4
3 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
html/cgi-bin/pakfire.cgi
View File

@@ -40,12 +40,12 @@ $pakfiresettings{'UUID'} = 'on';
if ($pakfiresettings{'ACTION'} eq 'install'){
$pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
if ("$pakfiresettings{'FORCE'}" eq "on") {
my $command = "/usr/local/bin/pakfire install --non-interactive $pakfiresettings{'INSPAKS'} &>/dev/null &";
my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
system("$command");
sleep(2);
} else {
&Header::openbox("100%", "center", "Abfrage");
my @output = `/usr/local/bin/pakfire resolvedeps $pakfiresettings{'INSPAKS'}`;
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
print <<END;
<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
<pre>
@@ -79,11 +79,11 @@ END
} elsif ($pakfiresettings{'ACTION'} eq 'update') {
system("/usr/local/bin/pakfire update --force");
system("/usr/local/bin/pakfire update --force --no-colors");
} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
system("/usr/local/bin/pakfire upgrade -y");
system("/usr/local/bin/pakfire upgrade -y --no-colors");
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
@@ -126,13 +126,13 @@ if ($return) {
</form>
<tr><td colspan='2' align='left'><pre>
END
my @output = `tail /var/log/messages | grep pakfire`;
foreach (@output) {
print "$_";
}
print <<END;
</pre>
</table>
my @output = `tail -20 /var/log/pakfire.log`;
foreach (@output) {
print "$_";
}
print <<END;
</pre>
</table>
END
&Header::closebox();
&Header::closebigbox();

50
src/pakfire/lib/functions.pl
View File

@@ -14,6 +14,10 @@ use Net::Ping;
package Pakfire;
# GPG Keys
my $myid = "64D96617"; # Our own gpg-key paks@ipfire.org
my $trustid = "65D0FD58"; # gpg-key of CaCert
# A small color-hash :D
my %color;
$color{'normal'} = "\033[0m";
@@ -33,6 +37,7 @@ my %color;
$color{'lightgrey'} = "\033[0;37m";
$color{'yellow'} = "\033[1;33m";
$color{'white'} = "\033[1;37m";
our $enable_colors = 1;
my $final_data;
my $total_size;
@@ -45,20 +50,22 @@ sub message {
my $message = shift;
logger("$message");
if ("$message" =~ /ERROR/) {
$message = "$color{'red'}$message$color{'normal'}";
} elsif ("$message" =~ /INFO/) {
$message = "$color{'cyan'}$message$color{'normal'}";
} elsif ("$message" =~ /WARN/) {
$message = "$color{'yellow'}$message$color{'normal'}";
} elsif ("$message" =~ /RESV/) {
$message = "$color{'purple'}$message$color{'normal'}";
} elsif ("$message" =~ /INST/) {
$message = "$color{'green'}$message$color{'normal'}";
} elsif ("$message" =~ /REMV/) {
$message = "$color{'lightred'}$message$color{'normal'}";
} elsif ("$message" =~ /UPGR/) {
$message = "$color{'lightblue'}$message$color{'normal'}";
if ( $enable_colors == 1 ) {
if ("$message" =~ /ERROR/) {
$message = "$color{'red'}$message$color{'normal'}";
} elsif ("$message" =~ /INFO/) {
$message = "$color{'cyan'}$message$color{'normal'}";
} elsif ("$message" =~ /WARN/) {
$message = "$color{'yellow'}$message$color{'normal'}";
} elsif ("$message" =~ /RESV/) {
$message = "$color{'purple'}$message$color{'normal'}";
} elsif ("$message" =~ /INST/) {
$message = "$color{'green'}$message$color{'normal'}";
} elsif ("$message" =~ /REMV/) {
$message = "$color{'lightred'}$message$color{'normal'}";
} elsif ("$message" =~ /UPGR/) {
$message = "$color{'lightblue'}$message$color{'normal'}";
}
}
print "$message\n";
@@ -73,11 +80,17 @@ sub logger {
}
sub usage {
&Pakfire::message("Usage: pakfire <install|remove> <pak(s)>");
&Pakfire::message("Usage: pakfire <install|remove> [options] <pak(s)>");
&Pakfire::message(" <update> - Contacts the servers for new lists of paks.");
&Pakfire::message(" <upgrade> - Installs the latest version of all paks.");
&Pakfire::message(" <list> - Outputs a short list with all available paks.");
&Pakfire::message("");
&Pakfire::message(" Global options:");
&Pakfire::message(" --non-interactive --> Enables the non-interactive mode.");
&Pakfire::message(" You won't see any question here.");
&Pakfire::message(" -y --> Short for --non-interactive.");
&Pakfire::message(" --no-colors --> Turns off the wonderful colors.");
&Pakfire::message("");
exit 1;
}
@@ -122,7 +135,6 @@ sub fetchfile {
unless ($bfile =~ /^counter\?.*/) {
logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
#message("DOWNLOAD INFO: Loading $bfile from ($proto) $host...");
}
my $ua = LWP::UserAgent->new;
@@ -669,14 +681,12 @@ sub senduuid {
sub checkcryptodb {
logger("CRYPTO INFO: Checking GnuPG Database");
my $myid = "64D96617"; # Our own gpg-key
my $trustid = "65D0FD58"; # Id of CaCert
my $ret = system("gpg --list-keys | grep -q $myid");
unless ( "$ret" eq "0" ) {
message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
message("CRYPTO WARN: It's normal to see this on first execution.");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid --status-fd 2 >> $Conf::logdir/gnupg-database.log 2>&1");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid --status-fd 2 >> $Conf::logdir/gnupg-database.log 2>&1");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
} else {
logger("CRYPTO INFO: Database is okay");
}

5
src/pakfire/pakfire
View File

@@ -39,8 +39,12 @@
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");
}
}
@@ -251,6 +255,7 @@
} elsif ("$ARGV[0]" eq "resolvedeps") {
foreach (@ARGV) {
next if ("$_" eq "resolvedeps");
next if ("$_" =~ "^-");
&Pakfire::resolvedeps("$_");
}
} else {