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

Merge branch 'webmin:master' into master

Browse Source
This commit is contained in:
MacSteini
2025-02-19 01:27:59 +00:00
committed by GitHub
parent c3d03ed9e7 42b823e3e9
commit 84d8b9fe62
56 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
software/apt-lib.pl
View File

@@ -25,7 +25,7 @@ $ENV{'DEBIAN_FRONTEND'} = 'noninteractive';
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 "<b>",&text('apt_install', "<tt>".&html_escape($uicmd)."</tt>"),"</b><p>\n";
print &text('apt_install', "<tt>".&html_escape($uicmd)."</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, $cmd);
@@ -65,8 +65,8 @@ if (!@rv && $config{'package_system'} ne 'debian' && !$?) {
@rv = @newpacks;
}
print "</pre>\n";
if ($?) { print "<b>$text{'apt_failed'}</b><p>\n"; }
else { print "<b>$text{'apt_ok'}</b><p>\n"; }
if ($?) { print "$text{'apt_failed'}<p>\n"; }
else { print "$text{'apt_ok'}<p>\n"; }
return @rv;
}

12
software/csw-lib.pl
View File

@@ -31,8 +31,8 @@ do {
last;
}
local $flag = $pkg_get =~ /pkgutil$/ ? "-y" : "-f";
print "<b>",&text('csw_install',
"<tt>$pkg_get -i $flag $update</tt>"),"</b><p>\n";
print &text('csw_install',
"<tt>$pkg_get -i $flag $update</tt>"),"<p>\n";
$failed = 0;
$retry = 0;
print "<pre>";
@@ -64,7 +64,7 @@ do {
print "</pre>";
if ($retry) {
print "<b>$text{'csw_retry'}</b><p>\n";
print "$text{'csw_retry'}<p>\n";
}
} while ($retry);
@@ -72,15 +72,15 @@ do {
&copy_source_dest("/var/pkg-get/admin-old", "/var/pkg-get/admin");
if ($failed == 1) {
print "<b>$text{'csw_failed'}</b><p>\n";
print "$text{'csw_failed'}<p>\n";
return ( );
}
elsif ($failed == 2) {
print "<b>$text{'csw_already'}</b><p>\n";
print "$text{'csw_already'}<p>\n";
return ( );
}
else {
print "<b>$text{'csw_ok'}</b><p>\n";
print "$text{'csw_ok'}<p>\n";
if (!@rv) {
# If nothing failed, assume that everything worked
@rv = split(/\s+/, $update);

6
software/emerge-lib.pl
View File

@@ -300,7 +300,7 @@ sub update_system_install
local $update = $_[0] || $in{'update'};
local $cmd = "emerge ".quotemeta($update);
local @rv;
print "<b>",&text('emerge_install', "<tt>$cmd</tt>"),"</b><p>\n";
print &text('emerge_install', "<tt>$cmd</tt>"),"<p>\n";
print "<pre>\n";
&additional_log('exec', undef, $cmd);
&open_execute_command(CMD, "$cmd 2>&1 </dev/null", 1);
@@ -312,8 +312,8 @@ while(<CMD>) {
}
close(CMD);
print "</pre>\n";
if ($?) { print "<b>$text{'emerge_failed'}</b><p>\n"; }
else { print "<b>$text{'emerge_ok'}</b><p>\n"; }
if ($?) { print "$text{'emerge_failed'}<p>\n"; }
else { print "$text{'emerge_ok'}<p>\n"; }
return @rv;
}

6
software/ipkg-lib.pl
View File

@@ -232,7 +232,7 @@ sub update_system_install
local $update = $_[0] || $in{'update'};
local (@rv, @newpacks);
local $cmd = "$ipkg install";
print "<b>",&text('IPKG_install', "<tt>$cmd</tt>"),"</b><p>\n";
print &text('IPKG_install', "<tt>$cmd</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, "$cmd $update");
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
@@ -250,11 +250,11 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($?) {
print "<b>$text{'IPKG_failed'}</b><p>\n";
print "$text{'IPKG_failed'}<p>\n";
return ( );
}
else {
print "<b>$text{'IPKG_ok'}</b><p>\n";
print "$text{'IPKG_ok'}<p>\n";
return &unique(@rv);
}
}

6
software/pkg-lib.pl
View File

@@ -16,7 +16,7 @@ my $force = !$_[2];
# Build and show command to run
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
my $cmd = "pkg install ".$update;
print "<b>",&text('pkg_install', "<tt>$cmd</tt>"),"</b><p>\n";
print &text('pkg_install', "<tt>$cmd</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, $cmd);
@@ -36,8 +36,8 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($?) { print "<b>$text{'pkg_failed'}</b><p>\n"; }
else { print "<b>$text{'pkg_ok'}</b><p>\n"; }
if ($?) { print "$text{'pkg_failed'}<p>\n"; }
else { print "$text{'pkg_ok'}<p>\n"; }
return @rv;
}

6
software/pkgsrc-lib.pl
View File

@@ -222,7 +222,7 @@ my @rv;
# Build and show command to run
$update = join(" ", map { quotemeta($_) } split(/\s+/, $update));
my $cmd = "pkgin -y install ".$update;
print "<b>",&text('pkgsrc_install', "<tt>$cmd</tt>"),"</b><p>\n";
print &text('pkgsrc_install', "<tt>$cmd</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, $cmd);
@@ -238,8 +238,8 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($?) { print "<b>$text{'pkg_failed'}</b><p>\n"; }
else { print "<b>$text{'pkg_ok'}</b><p>\n"; }
if ($?) { print "$text{'pkg_failed'}<p>\n"; }
else { print "$text{'pkg_ok'}<p>\n"; }
return @rv;
}

6
software/ports-lib.pl
View File

@@ -8,7 +8,7 @@ my ($update, $in) = @_;
$update ||= $in{'update'};
my (@rv, @newpacks);
my @want = split(/\s+/, $update);
print "<b>",&text('ports_install', "<tt>$update</tt>"),"</b><p>\n";
print &text('ports_install', "<tt>$update</tt>"),"<p>\n";
print "<pre>";
my $err = 0;
foreach my $w (@want) {
@@ -54,11 +54,11 @@ foreach my $w (@want) {
}
print "</pre>\n";
if ($err) {
print "<b>$text{'ports_failed'}</b><p>\n";
print "$text{'ports_failed'}<p>\n";
return ( );
}
else {
print "<b>$text{'ports_ok'}</b><p>\n";
print "$text{'ports_ok'}<p>\n";
return &unique(@rv);
}
}

6
software/rhn-lib.pl
View File

@@ -15,7 +15,7 @@ sub update_system_install
{
local $update = $_[0] || $in{'update'};
local @rv;
print "<b>",&text('rhn_install', "<tt>up2date $update</tt>"),"</b><p>\n";
print &text('rhn_install', "<tt>up2date $update</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, "up2date \"$update\"");
local $qm = quotemeta($update);
@@ -32,11 +32,11 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($got_error) {
print "<b>$text{'rhn_failed'}</b><p>\n";
print "$text{'rhn_failed'}<p>\n";
@rv = ( );
}
else {
print "<b>$text{'rhn_ok'}</b><p>\n";
print "$text{'rhn_ok'}<p>\n";
}
return @rv;
}

6
software/urpmi-lib.pl
View File

@@ -13,7 +13,7 @@ sub update_system_install
local $update = $_[0] || $in{'update'};
local (@rv, @newpacks);
local $cmd = "urpmi --force --auto";
print "<b>",&text('urpmi_install', "<tt>$cmd $update</tt>"),"</b><p>\n";
print &text('urpmi_install', "<tt>$cmd $update</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, "$cmd $update");
local $qm = join(" ", map { quotemeta($_) } split(/\s+/, $update));
@@ -31,11 +31,11 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($?) {
print "<b>$text{'urpmi_failed'}</b><p>\n";
print "$text{'urpmi_failed'}<p>\n";
return ( );
}
else {
print "<b>$text{'urpmi_ok'}</b><p>\n";
print "$text{'urpmi_ok'}<p>\n";
return &unique(@rv);
}
}

6
software/yum-lib.pl
View File

@@ -72,7 +72,7 @@ foreach my $u (@updates) {
}
}
print "<b>",&text('yum_install', "<tt>".&html_escape($uicmd)."</tt>"),"</b><p>\n";
print &text('yum_install', "<tt>".&html_escape($uicmd)."</tt>"),"<p>\n";
print "<pre>";
&additional_log('exec', undef, $fullcmd);
$SIG{'TERM'} = 'ignore'; # Installing webmin itself may kill this script
@@ -129,11 +129,11 @@ while(<CMD>) {
close(CMD);
print "</pre>\n";
if ($? || $nopackage) {
print "<b>$text{'yum_failed'}</b><p>\n";
print "$text{'yum_failed'}<p>\n";
return ( );
}
else {
print "<b>$text{'yum_ok'}</b><p>\n";
print "$text{'yum_ok'}<p>\n";
return &unique(@rv);
}
}