Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / pakfire.cgi

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index dd42375cfd489438d54044c6a229ec6733a5574d..69bd11d3e23c20fc7ed3b4162bee2f7a035930d4 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -46,6 +46,8 @@ $pakfiresettings{'AUTOUPDATE'} = 'off';
 $pakfiresettings{'AUTOUPGRADE'} = 'off';
 $pakfiresettings{'UUID'} = 'on';
 
+sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+
 &Header::getcgihash(\%pakfiresettings);
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -59,7 +61,6 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
        if ("$pakfiresettings{'FORCE'}" eq "on") {
                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 --no-colors $pakfiresettings{'INSPAKS'}`;
@@ -99,7 +100,6 @@ END
        if ("$pakfiresettings{'FORCE'}" eq "on") {
                my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
                system("$command");
-               sleep(2);
        } else {
                &Header::openbox("100%", "center", "Abfrage");
        my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
@@ -136,21 +136,20 @@ END
 
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
 
-       system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
+       system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
 
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
-
-       system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null");
-
+       my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
+       system("$command");
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
-       if ($pakfiresettings{'AUTOUPDATE'} == "on") {
+       if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {
                system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1");
        } else {
                system("/usr/local/bin/pakfire disable updates  >/dev/null 2>&1");
        }
 
-       if ($pakfiresettings{'AUTOUPGRADE'} == "on") {
+       if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') {
                system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
        } else {
                system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1");
@@ -197,7 +196,7 @@ if ($return) {
                        </form>
                <tr><td colspan='2' align='left'><pre>
 END
-       my @output = `tail -20 /var/log/pakfire.log`;
+       my @output = `grep pakfire /var/log/messages | tail -20`;
        foreach (@output) {
                print "$_";
        }
@@ -209,6 +208,7 @@ END
        &Header::closebigbox();
        &Header::closepage();
        exit;
+       refreshpage();
 }
 
 my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;
@@ -231,7 +231,7 @@ print <<END;
                                        $Lang::tr{'pakfire last package update'} $packages_update_age ago
                                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='ACTION' value='update' />
-                                               <input type='submit' value='Liste aktualisieren' /><br />
+                                               <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />
                                        </form>
                                <td align="center">
                                 <form method='post' action='$ENV{'SCRIPT_NAME'}'>