ktest: Evaluate variables entered on the command line
When ktest.pl is called without any arguments, or if the config file does not exist, ktest.pl will ask the user for some information. Some of these questions are code paths. Allowing the user to type ${PWD} for the current directory greatly simplifies these entries. Add variable processing to the entered values. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
7bf5107347
commit
815e2bd7d6
1 changed files with 6 additions and 4 deletions
|
@ -250,6 +250,7 @@ sub read_yn {
|
|||
|
||||
sub get_ktest_config {
|
||||
my ($config) = @_;
|
||||
my $ans;
|
||||
|
||||
return if (defined($opt{$config}));
|
||||
|
||||
|
@ -263,16 +264,17 @@ sub get_ktest_config {
|
|||
if (defined($default{$config})) {
|
||||
print "\[$default{$config}\] ";
|
||||
}
|
||||
$entered_configs{$config} = <STDIN>;
|
||||
$entered_configs{$config} =~ s/^\s*(.*\S)\s*$/$1/;
|
||||
if ($entered_configs{$config} =~ /^\s*$/) {
|
||||
$ans = <STDIN>;
|
||||
$ans =~ s/^\s*(.*\S)\s*$/$1/;
|
||||
if ($ans =~ /^\s*$/) {
|
||||
if ($default{$config}) {
|
||||
$entered_configs{$config} = $default{$config};
|
||||
$ans = $default{$config};
|
||||
} else {
|
||||
print "Your answer can not be blank\n";
|
||||
next;
|
||||
}
|
||||
}
|
||||
$entered_configs{$config} = process_variables($ans);
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue