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

Fix to support the mode without user prompt

Browse Source
This commit is contained in:
iliajie
2023-07-19 19:52:59 +03:00
parent 91a0e71d6f
commit dc721b2e4e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/language-manager
View File

@@ -61,7 +61,8 @@ sub main
'allow-symlinks|as!' => \$opt{'allow-symlinks'},
'git-commit|gc!' => \$opt{'git-commit'},
'log|l:s' => \$opt{'log'},
'verbose|v:i' => \$opt{'verbose'});
'verbose|v:i' => \$opt{'verbose'},
'yes|y:i' => \$opt{'assumeyes'});
# Print help and exit
pod2usage(0) if ($opt{'help'});
@@ -70,6 +71,11 @@ sub main
if (!defined($opt{'verbose'})) {
$opt{'verbose'} = 1;
}
# Enforce yes for all questions
if (defined($opt{'assumeyes'})) {
$opt{'assumeyes'} = 1;
}
# Get current path
my $path = cwd;
@@ -232,7 +238,7 @@ sub main
# Just run tests, and exit, without writing anything
if (@{ $opt{'keys-test'} }) {
say CYAN, "Translation testing for selected keys is about to start ..", RESET;
if (prompt('next')) {
if (prompt('next', \%opt)) {
go(\%opt, \%data);
}
} else {
@@ -248,7 +254,7 @@ sub main
if ($opt{'mode'} eq 'clean') {
# # Execute clean
talk('clean-pre', \%opt, \%data);
if (prompt('next')) {
if (prompt('next', \%opt)) {
go(\%opt, \%data);
}
}
@@ -258,7 +264,7 @@ sub main
# Execute force transcode/translate
talk('overwrite-pre', \%opt, \%data);
if (prompt('next')) {
if (prompt('next', \%opt)) {
go(\%opt, \%data);
}
}
@@ -283,7 +289,7 @@ sub main
talk('sync-pre', \%opt, \%data);
}
if (prompt('next')) {
if (prompt('next', \%opt)) {
go(\%opt, \%data);
}
}
@@ -546,7 +552,7 @@ sub language_transcode
eval {$string = decode($encoding, $string)};
if ($@) {
say "Error found: $@";
if (!prompt('next')) {
if (!prompt('next', $opt)) {
exit;
}
}
@@ -1692,8 +1698,10 @@ sub get_google_translate_token
sub prompt
{
my ($q) = @_;
my ($q, $opt) = @_;
if ($opt->{'assumeyes'}) {
return 1;
}
if ($q eq 'next') {
return prompt("Do you want to proceed?");
}