mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 06:03:28 +00:00
Fix to add identifier for pre tag
This commit is contained in:
@@ -26,7 +26,7 @@ local $uicmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update";
|
||||
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
|
||||
local $cmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update";
|
||||
print &text('apt_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, $cmd);
|
||||
|
||||
# Run dpkg --configure -a to clear any un-configured packages
|
||||
|
||||
@@ -35,7 +35,7 @@ do {
|
||||
"<tt>$pkg_get -i $flag $update</tt>"),"\n";
|
||||
$failed = 0;
|
||||
$retry = 0;
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&open_execute_command(PKGGET,
|
||||
"$pkg_get -i $flag ".quotemeta($update), 2);
|
||||
while(<PKGGET>) {
|
||||
|
||||
@@ -301,7 +301,7 @@ local $update = $_[0] || $in{'update'};
|
||||
local $cmd = "emerge ".quotemeta($update);
|
||||
local @rv;
|
||||
print &text('emerge_install', "<tt>$cmd</tt>"),"\n";
|
||||
print "<pre>\n";
|
||||
print "<pre data-installer>\n";
|
||||
&additional_log('exec', undef, $cmd);
|
||||
&open_execute_command(CMD, "$cmd 2>&1 </dev/null", 1);
|
||||
while(<CMD>) {
|
||||
|
||||
@@ -233,7 +233,7 @@ local $update = $_[0] || $in{'update'};
|
||||
local (@rv, @newpacks);
|
||||
local $cmd = "$ipkg install";
|
||||
print &text('IPKG_install', "<tt>$cmd</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, "$cmd $update");
|
||||
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
|
||||
&open_execute_command(CMD, "$cmd $qm", 2);
|
||||
|
||||
@@ -17,7 +17,7 @@ my $force = !$_[2];
|
||||
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
|
||||
my $cmd = "pkg install ".$update;
|
||||
print &text('pkg_install', "<tt>$cmd</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, $cmd);
|
||||
|
||||
# Run it
|
||||
|
||||
@@ -223,7 +223,7 @@ my @rv;
|
||||
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
|
||||
my $cmd = "pkgin -y install ".$update;
|
||||
print &text('pkgsrc_install', "<tt>$cmd</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, $cmd);
|
||||
|
||||
# Run it
|
||||
|
||||
@@ -16,7 +16,7 @@ sub update_system_install
|
||||
local $update = $_[0] || $in{'update'};
|
||||
local @rv;
|
||||
print &text('rhn_install', "<tt>up2date $update</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, "up2date \"$update\"");
|
||||
local $qm = quotemeta($update);
|
||||
&open_execute_command(CMD, "up2date $qm", 2);
|
||||
|
||||
@@ -14,7 +14,7 @@ local $update = $_[0] || $in{'update'};
|
||||
local (@rv, @newpacks);
|
||||
local $cmd = "urpmi --force --auto";
|
||||
print &text('urpmi_install', "<tt>$cmd $update</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, "$cmd $update");
|
||||
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
|
||||
&open_execute_command(CMD, "$cmd $qm </dev/null", 2);
|
||||
|
||||
@@ -73,7 +73,7 @@ foreach my $u (@updates) {
|
||||
}
|
||||
|
||||
print &text('yum_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n";
|
||||
print "<pre>";
|
||||
print "<pre data-installer>";
|
||||
&additional_log('exec', undef, $fullcmd);
|
||||
$SIG{'TERM'} = 'ignore'; # Installing webmin itself may kill this script
|
||||
&open_execute_command(CMD, "$fullcmd </dev/null", 2);
|
||||
|
||||
Reference in New Issue
Block a user