michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to add identifier for pre tag

Browse Source
This commit is contained in:
Ilia Ross
2025-08-19 22:45:46 +03:00
parent 29a4b6b598
commit dd445a67f1
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
software/apt-lib.pl
View File

@@ -26,7 +26,7 @@ local $uicmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update";
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update)); $update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
local $cmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update"; local $cmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update";
print &text('apt_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n"; print &text('apt_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, $cmd); &additional_log('exec', undef, $cmd);
# Run dpkg --configure -a to clear any un-configured packages # Run dpkg --configure -a to clear any un-configured packages

2
software/csw-lib.pl
View File

@@ -35,7 +35,7 @@ do {
"<tt>$pkg_get -i $flag $update</tt>"),"\n"; "<tt>$pkg_get -i $flag $update</tt>"),"\n";
$failed = 0; $failed = 0;
$retry = 0; $retry = 0;
print "<pre>"; print "<pre data-installer>";
&open_execute_command(PKGGET, &open_execute_command(PKGGET,
"$pkg_get -i $flag ".quotemeta($update), 2); "$pkg_get -i $flag ".quotemeta($update), 2);
while(<PKGGET>) { while(<PKGGET>) {

2
software/emerge-lib.pl
View File

@@ -301,7 +301,7 @@ local $update = $_[0] || $in{'update'};
local $cmd = "emerge ".quotemeta($update); local $cmd = "emerge ".quotemeta($update);
local @rv; local @rv;
print &text('emerge_install', "<tt>$cmd</tt>"),"\n"; print &text('emerge_install', "<tt>$cmd</tt>"),"\n";
print "<pre>\n"; print "<pre data-installer>\n";
&additional_log('exec', undef, $cmd); &additional_log('exec', undef, $cmd);
&open_execute_command(CMD, "$cmd 2>&1 </dev/null", 1); &open_execute_command(CMD, "$cmd 2>&1 </dev/null", 1);
while(<CMD>) { while(<CMD>) {

2
software/ipkg-lib.pl
View File

@@ -233,7 +233,7 @@ local $update = $_[0] || $in{'update'};
local (@rv, @newpacks); local (@rv, @newpacks);
local $cmd = "$ipkg install"; local $cmd = "$ipkg install";
print &text('IPKG_install', "<tt>$cmd</tt>"),"\n"; print &text('IPKG_install', "<tt>$cmd</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, "$cmd $update"); &additional_log('exec', undef, "$cmd $update");
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update)); local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
&open_execute_command(CMD, "$cmd $qm", 2); &open_execute_command(CMD, "$cmd $qm", 2);

2
software/pkg-lib.pl
View File

@@ -17,7 +17,7 @@ my $force = !$_[2];
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update)); $update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
my $cmd = "pkg install ".$update; my $cmd = "pkg install ".$update;
print &text('pkg_install', "<tt>$cmd</tt>"),"\n"; print &text('pkg_install', "<tt>$cmd</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, $cmd); &additional_log('exec', undef, $cmd);
# Run it # Run it

2
software/pkgsrc-lib.pl
View File

@@ -223,7 +223,7 @@ my @rv;
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update)); $update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
my $cmd = "pkgin -y install ".$update; my $cmd = "pkgin -y install ".$update;
print &text('pkgsrc_install', "<tt>$cmd</tt>"),"\n"; print &text('pkgsrc_install', "<tt>$cmd</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, $cmd); &additional_log('exec', undef, $cmd);
# Run it # Run it

2
software/rhn-lib.pl
View File

@@ -16,7 +16,7 @@ sub update_system_install
local $update = $_[0] || $in{'update'}; local $update = $_[0] || $in{'update'};
local @rv; local @rv;
print &text('rhn_install', "<tt>up2date $update</tt>"),"\n"; print &text('rhn_install', "<tt>up2date $update</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, "up2date \"$update\""); &additional_log('exec', undef, "up2date \"$update\"");
local $qm = quotemeta($update); local $qm = quotemeta($update);
&open_execute_command(CMD, "up2date $qm", 2); &open_execute_command(CMD, "up2date $qm", 2);

2
software/urpmi-lib.pl
View File

@@ -14,7 +14,7 @@ local $update = $_[0] || $in{'update'};
local (@rv, @newpacks); local (@rv, @newpacks);
local $cmd = "urpmi --force --auto"; local $cmd = "urpmi --force --auto";
print &text('urpmi_install', "<tt>$cmd $update</tt>"),"\n"; print &text('urpmi_install', "<tt>$cmd $update</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, "$cmd $update"); &additional_log('exec', undef, "$cmd $update");
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update)); local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
&open_execute_command(CMD, "$cmd $qm </dev/null", 2); &open_execute_command(CMD, "$cmd $qm </dev/null", 2);

2
software/yum-lib.pl
View File

@@ -73,7 +73,7 @@ foreach my $u (@updates) {
} }
print &text('yum_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n"; print &text('yum_install', "<tt>".&html_escape($uicmd)."</tt>"),"\n";
print "<pre>"; print "<pre data-installer>";
&additional_log('exec', undef, $fullcmd); &additional_log('exec', undef, $fullcmd);
$SIG{'TERM'} = 'ignore'; # Installing webmin itself may kill this script $SIG{'TERM'} = 'ignore'; # Installing webmin itself may kill this script
&open_execute_command(CMD, "$fullcmd </dev/null", 2); &open_execute_command(CMD, "$fullcmd </dev/null", 2);