summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-04-11 10:36:01 +0000
committerOlivier Blin <oblin@mandriva.org>2005-04-11 10:36:01 +0000
commitcedd8898892dd1717bd98ed2917a03a31b1b45c1 (patch)
tree6188c27311f95a45ba6c3da9d8059c0314a4ef0a /perl-install/standalone
parent9b209984bbff58a6cde0b5d2d327cbc38b66f678 (diff)
downloaddrakx-backup-do-not-use-cedd8898892dd1717bd98ed2917a03a31b1b45c1.tar
drakx-backup-do-not-use-cedd8898892dd1717bd98ed2917a03a31b1b45c1.tar.gz
drakx-backup-do-not-use-cedd8898892dd1717bd98ed2917a03a31b1b45c1.tar.bz2
drakx-backup-do-not-use-cedd8898892dd1717bd98ed2917a03a31b1b45c1.tar.xz
drakx-backup-do-not-use-cedd8898892dd1717bd98ed2917a03a31b1b45c1.zip
handle ESSID with spaces (#15352)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakroam4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/drakroam b/perl-install/standalone/drakroam
index e76399ee9..c54240ee6 100755
--- a/perl-install/standalone/drakroam
+++ b/perl-install/standalone/drakroam
@@ -260,7 +260,7 @@ sub UpdateStatus() {
my $CurrentSignal = "-";
print "Updating\n" if $::testing;
foreach (run_program::get_stdout($IWConfig, $device)) {
- /ESSID:"(\S*)"/ and $CurrentNet = $1;
+ /ESSID:"(.*?)"/ and $CurrentNet = $1;
/Mode:(\S*)\s/ and $CurrentMode = $1;
/key:(\S*)\s/ and $CurrentWEP = $1;
m!Quality:(\S*)/! and $CurrentSignal = $1;
@@ -288,7 +288,7 @@ sub UpdateAvailable() {
foreach (`$IWList scan 2>/dev/null`) {
/([^ ]+)([ \t]+)Scan completed :/ and $device = $1;
/([^ ]+)([ \t]+)No scan results/ and $device = $1;
- /ESSID:"(\S*)"/ and $essid = $1;
+ /ESSID:".*?"/ and $essid = $1;
/Mode:(\S*)/ and $mode = $1;
m!Quality:(\S*)/! and $signal = $1;
if (/key:(\S*)\s/) {