DRY of boolean options

diff --git a/jimlib/check-utils.tcl b/jimlib/check-utils.tcl
new file mode 100644 (file)
index 0000000..464b668
--- /dev/null
+++ b/jimlib/check-utils.tcl
@@ -0,0 +1,13 @@
+proc parse-bool {v} {
+    if {$v == ""} {
+        return no
+    }
+    if {![string is boolean $v]} {
+        puts {is not boolean}
+        exit 1
+    }
+    if {$v} {
+        return yes
+    }
+    return no
+}

diff --git a/jimlib/net-utils.tcl b/jimlib/net-utils.tcl
index a73310937cf78a3cb4b3d65295c5d71136314dfc70cd207b54e90f6b1696f702..5c24cda56c385789b75835ea969941f7c120462b66520d922fcad36e51ae73aa 100644 (file)
--- a/jimlib/net-utils.tcl
+++ b/jimlib/net-utils.tcl
@@ -35,5 +35,3 @@ proc list-addrs {iface} {
     }
     return $addrs
 }
-
-package provide net-utils

diff --git a/schema/srv/*/autostart/check b/schema/srv/*/autostart/check
index f4de234006119ec40950d370c808bb48a7ad0bd3c8532911ea5847c0e8d181a9..304cf9598b77c571faf007f2997d69833290158411cb93b9b42b3a6f627b3a9a 100755 (executable)
--- a/schema/srv/*/autostart/check
+++ b/schema/srv/*/autostart/check
@@ -1,11 +1,5 @@
 #!/usr/bin/env jimsh
 
-set n [read -nonewline stdin]
-if {$n == ""} {
-    set n no
-}
-if {![string is boolean $n]} {
-    puts {is not boolean}
-    exit 1
-}
-puts $n
+package require check-utils
+set v [parse-bool [read -nonewline stdin]]
+puts $v

diff --git a/schema/ssh/enabled/check b/schema/ssh/enabled/check
index f4de234006119ec40950d370c808bb48a7ad0bd3c8532911ea5847c0e8d181a9..304cf9598b77c571faf007f2997d69833290158411cb93b9b42b3a6f627b3a9a 100755 (executable)
--- a/schema/ssh/enabled/check
+++ b/schema/ssh/enabled/check
@@ -1,11 +1,5 @@
 #!/usr/bin/env jimsh
 
-set n [read -nonewline stdin]
-if {$n == ""} {
-    set n no
-}
-if {![string is boolean $n]} {
-    puts {is not boolean}
-    exit 1
-}
-puts $n
+package require check-utils
+set v [parse-bool [read -nonewline stdin]]
+puts $v