From 883fb8f41b08a8455f16c736a83fb1ae8a3df0a1 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 17 Oct 2022 16:26:19 +0400 Subject: installer: Factorize url-alive? in internet check. * gnu/installer/newt/network.scm (wait-service-online): Factorize url-alive? in internet check. --- gnu/installer/newt/network.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index b11a55cb1f..ba26fc7c76 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -115,6 +115,11 @@ (define (wait-technology-powered technology) (define (wait-service-online) "Display a newt scale until connman detects an Internet access. Do FULL-VALUE tentatives, spaced by 1 second." + (define (url-alive? url) + (false-if-exception + (= (response-code (http-request url)) + 200))) + (define (ci-available?) (dynamic-wind (lambda () @@ -122,15 +127,8 @@ (define (ci-available?) (lambda _ #f)) (alarm 3)) (lambda () - (or - (false-if-exception - (= (response-code - (http-request "https://ci.guix.gnu.org")) - 200)) - (false-if-exception - (= (response-code - (http-request "https://bordeaux.guix.gnu.org")) - 200)))) + (or (url-alive? "https://ci.guix.gnu.org") + (url-alive? "https://bordeaux.guix.gnu.org"))) (lambda () (alarm 0)))) -- cgit v1.2.3