Commit 92d76bd7 authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard

Further simplify the code and remove some redundant code.

Make the user interface more consistent and appealing.
parent d28ded3d
...@@ -51,7 +51,7 @@ $var0 = qq{ ...@@ -51,7 +51,7 @@ $var0 = qq{
doing so it leaves out the long descriptions. doing so it leaves out the long descriptions.
}; };
print do_var($var0)."\n"; print do_var($var0)."\n";
until ($debuglevel == 1 or $debuglevel == 2 or $debuglevel == 3) { until ($debuglevel >= 1 and $debuglevel <= 3) {
print "Enter your level of WINE expertise (1-3): "; print "Enter your level of WINE expertise (1-3): ";
$debuglevel=<STDIN>; $debuglevel=<STDIN>;
chomp $debuglevel; chomp $debuglevel;
...@@ -119,37 +119,31 @@ if ($outfile ne "no file" and $dbgoutfile eq "no file") { ...@@ -119,37 +119,31 @@ if ($outfile ne "no file" and $dbgoutfile eq "no file") {
} }
} }
print "Looking for wine...\n";
$whereis=`whereis wine`; $whereis=`whereis wine`;
chomp $whereis; chomp $whereis;
print "Choose one of the following options:\n"; print "\nWhere is your copy of Wine located?\n\n";
$whereis =~ s/^wine\: //; $whereis =~ s/^wine\: //;
@locations = split(/\s/,$whereis); @locations = split(/\s/,$whereis);
print "1. Unlisted (I'll prompt you for a new location\n"; print "1 - Unlisted (I'll prompt you for a new location\n";
print "2. Unsure (I'll use #3, that's probably it)\n"; print "2 - Unsure (I'll use #3, that's probably it)\n";
$i=2; $i=2;
foreach $location (@locations) { foreach $location (@locations) {
$i++; $i++;
print "$i. $location\n"; print "$i - $location\n";
} }
print "\n";
sub select_wineloc { sub select_wineloc {
print "Enter the number that corresponds to wine's location:"; do
{
print "Enter the number the corresponds to Wine's location: ";
$wineloc=<STDIN>; $wineloc=<STDIN>;
chomp $wineloc; chomp $wineloc;
$yes = 1 if $wineloc == 1 or $wineloc == 2;
$i=3;
foreach $location (@locations) {
$yes = 1 if $wineloc eq $i++;
}
while ($yes ne "1") {
print "Enter the number the corresponds to wine's location:";
$wineloc=<STDIN>;
chomp $wineloc;
$i=1; $i=1;
foreach $location (@locations) { foreach $location (@locations) {
$yes = 1 if $wineloc eq $i++; $yes = 1 if $wineloc eq $i++;
} }
} }
while ($yes ne "1");
if ($wineloc == 1) { if ($wineloc == 1) {
$var25 = qq{ $var25 = qq{
Enter the full path to wine (Example: /usr/bin/wine): Enter the full path to wine (Example: /usr/bin/wine):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment