jmd pushed a commit to branch wip-installer
in repository guix.
commit c8314dc2162b0ac9b915a8d1fa3d1a8c7ea02d36
Author: John Darrington <[email protected]>
Date: Wed Jan 18 13:41:46 2017 +0100
installer: Remove unnecessary "begin".
* gnu/system/installer/wireless.scm (get-wifi): Remove superfluous "begin".
---
gnu/system/installer/wireless.scm | 86 ++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/gnu/system/installer/wireless.scm
b/gnu/system/installer/wireless.scm
index efaa87b..e26b257 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -181,49 +181,49 @@
s))
(define (get-wifi ifce)
- (begin (system* "ip" "link" "set" ifce "up")
- (fold
- (lambda (x prev)
- (let ((mtch (string-match "Cell [0-9][0-9] - " x)))
- (cond (mtch
- (cons
- (list
- `(address . ,
- (drop-prefix "Address: "
- (string-drop x (string-length
(match:substring mtch))))))
- prev))
-
- ((string-prefix? "Encryption key:" x)
- (cons
- (append (car prev)
- (list `(encryption .
- ,(string-suffix? "on" x))))
- (cdr prev)))
-
- ((string-prefix? "Quality=" x)
- (let ((lvl (string-match "level=(-?[0-9][0-9]*) dBm" x)))
- (if lvl
- (cons
- (append (car prev)
- (list
- `(signal . ,(string->number
(match:substring lvl 1))))
- )
- (cdr prev))
- prev)))
-
- ((string-prefix? "ESSID:" x)
- (cons
- (append (car prev)
- (list
- `(essid . ,(drop-prefix "ESSID:"
- (drop-quotes
- x))))
- )
- (cdr prev)))
-
- (else
- prev))))
- '() (scan-wifi ifce))))
+ (system* "ip" "link" "set" ifce "up")
+ (fold
+ (lambda (x prev)
+ (let ((mtch (string-match "Cell [0-9][0-9] - " x)))
+ (cond (mtch
+ (cons
+ (list
+ `(address . ,
+ (drop-prefix "Address: "
+ (string-drop x (string-length
(match:substring mtch))))))
+ prev))
+
+ ((string-prefix? "Encryption key:" x)
+ (cons
+ (append (car prev)
+ (list `(encryption .
+ ,(string-suffix? "on" x))))
+ (cdr prev)))
+
+ ((string-prefix? "Quality=" x)
+ (let ((lvl (string-match "level=(-?[0-9][0-9]*) dBm" x)))
+ (if lvl
+ (cons
+ (append (car prev)
+ (list
+ `(signal . ,(string->number (match:substring lvl
1))))
+ )
+ (cdr prev))
+ prev)))
+
+ ((string-prefix? "ESSID:" x)
+ (cons
+ (append (car prev)
+ (list
+ `(essid . ,(drop-prefix "ESSID:"
+ (drop-quotes
+ x))))
+ )
+ (cdr prev)))
+
+ (else
+ prev))))
+ '() (scan-wifi ifce)))
