Unify negate

diff --git a/dsc b/dsc
index e302e4f7c407e5c1d3e0a860e10494b807509fb492d31659df45cb1755552fce..c234159d98ed2f1e4bf07f3e36524761dff08ae8e38ab57a72d9f83d05858ed8 100755 (executable)
--- a/dsc
+++ b/dsc
@@ -113,7 +113,7 @@ proc run-checker {opt v} {
 
 proc assure-exists {opt} {
     global Stash
 
 proc assure-exists {opt} {
     global Stash

-    if {! [file exists $Stash/$opt]} {
+    if {![file exists $Stash/$opt]} {

         puts stderr "not found"
         exit 1
     }
         puts stderr "not found"
         exit 1
     }


@@ -136,7 +136,7 @@ proc assure-all-list-params-exist {opt {offset 0}} {
     set idx [lindex [lsearch -all [file split $pth] "*"] end-$offset]
     if {$idx != ""} {
         set pth [file join {*}[lrange [file split $opt] 0 $idx]]
     set idx [lindex [lsearch -all [file split $pth] "*"] end-$offset]
     if {$idx != ""} {
         set pth [file join {*}[lrange [file split $opt] 0 $idx]]

-        if {! [file exists $Stash/$pth]} {
+        if {![file exists $Stash/$pth]} {

             puts stderr "$pth does not exist"
             exit 1
         }
             puts stderr "$pth does not exist"
             exit 1
         }


@@ -153,7 +153,7 @@ switch [lindex $argv 0] {
             set prefix [lindex $argv 2]
         }
         foreach opt [walk $Schema directory] {
             set prefix [lindex $argv 2]
         }
         foreach opt [walk $Schema directory] {

-            if {! [file exists $opt/title]} {continue}
+            if {![file exists $opt/title]} {continue}

             set name [string range $opt [expr {[string length $Schema] + 1}] end]
             if {$prefix != ""} {
                 if {[string range $name 0 [string length $prefix]-1] != $prefix} {
             set name [string range $opt [expr {[string length $Schema] + 1}] end]
             if {$prefix != ""} {
                 if {[string range $name 0 [string length $prefix]-1] != $prefix} {


@@ -219,7 +219,7 @@ switch [lindex $argv 0] {
     get {
         if {[file tail $opt] == "*"} {
             set opt [file dirname $opt]
     get {
         if {[file tail $opt] == "*"} {
             set opt [file dirname $opt]

-            if {! [file exists $Stash/$opt]} {
+            if {![file exists $Stash/$opt]} {

                 exit
             }
             foreach dir [readents $Stash/$opt directory] {
                 exit
             }
             foreach dir [readents $Stash/$opt directory] {

diff --git a/schema/net/*/addr/*/prefixlen/check b/schema/net/*/addr/*/prefixlen/check
index 23b9bd35f808adbf0ad970f825045a76d56973dd75c127289d68de4a745a7d04..c45a349eaf01c3caa908a5bd0a46be5b505eb74c0830cacdb1f08456c4c36eae 100755 (executable)
--- a/schema/net/*/addr/*/prefixlen/check
+++ b/schema/net/*/addr/*/prefixlen/check
@@ -12,7 +12,7 @@ set prefixlen [read -nonewline stdin]
 if {$prefixlen == ""} {
     set prefixlen $deflen
 }
 if {$prefixlen == ""} {
     set prefixlen $deflen
 }

-if {! [string is integer -strict $prefixlen]} {
+if {![string is integer -strict $prefixlen]} {

     puts "invalid integer"
     exit 1
 }
     puts "invalid integer"
     exit 1
 }

diff --git a/schema/net/*/check b/schema/net/*/check
index 5f001aac6df752ae4cf879667e5870b9e53eaf9828e38ae522f79e6d77eb507b..5fd814f20af3c475d098bcc39d02079a5292f9d9b2deacfc3aa70b8db72619fa 100755 (executable)
--- a/schema/net/*/check
+++ b/schema/net/*/check
@@ -1,7 +1,7 @@
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]

-if {! [regexp {^[a-z0-9]{1,16}$} $n]} {
+if {![regexp {^[a-z0-9]{1,16}$} $n]} {

     puts {does not match ^[a-z0-9]{1,16}$}
     exit 1
 }
     puts {does not match ^[a-z0-9]{1,16}$}
     exit 1
 }

diff --git a/schema/net/*/mtu/check b/schema/net/*/mtu/check
index 895ddd71f9bb57fec4856eadca9afe6874834be90096aa7149a9297e46dea21b..80917b01981c1e9422fccf6ed3a07bb4c8403b8f5de5e1eb88b72df249babca0 100755 (executable)
--- a/schema/net/*/mtu/check
+++ b/schema/net/*/mtu/check
@@ -4,7 +4,7 @@ set i [read -nonewline stdin]
 if {$i == ""} {
     set i 1500
 }
 if {$i == ""} {
     set i 1500
 }

-if {! [string is integer -strict $i]} {
+if {![string is integer -strict $i]} {

     puts "invalid integer"
     exit 1
 }
     puts "invalid integer"
     exit 1
 }

diff --git a/schema/srv/*/autostart/check b/schema/srv/*/autostart/check
index f9a1b3b7310070e1293443dc329bdba0af590b866fe3285f311dc7b8fe48b080..f4de234006119ec40950d370c808bb48a7ad0bd3c8532911ea5847c0e8d181a9 100755 (executable)
--- a/schema/srv/*/autostart/check
+++ b/schema/srv/*/autostart/check
@@ -4,7 +4,7 @@ set n [read -nonewline stdin]
 if {$n == ""} {
     set n no
 }
 if {$n == ""} {
     set n no
 }

-if {! [string is boolean $n]} {
+if {![string is boolean $n]} {

     puts {is not boolean}
     exit 1
 }
     puts {is not boolean}
     exit 1
 }

diff --git a/schema/srv/*/check b/schema/srv/*/check
index 18440e7e59747a4b22f31c18c5b7dedda7c6a9ae12562aca520830e80515e274..84f9639b8401c7d42b8407f2daeed94b48ec61bdd0c8570dbedc1f9b7a432a6d 100755 (executable)
--- a/schema/srv/*/check
+++ b/schema/srv/*/check
@@ -1,7 +1,7 @@
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]

-if {! [regexp {^[.A-Za-z0-9_-]{1,32}$} $n]} {
+if {![regexp {^[.A-Za-z0-9_-]{1,32}$} $n]} {

     puts {does not match ^[.A-Za-z0-9_-]{1,32}$}
     exit 1
 }
     puts {does not match ^[.A-Za-z0-9_-]{1,32}$}
     exit 1
 }

diff --git a/schema/ssh/authorized_keys/*/pub/check b/schema/ssh/authorized_keys/*/pub/check
index 158ef733b765130fe8285dc54b5769caa373124a9276e66c822d07a711c3ce9c..11bef2837aff0d7608333ead7a7582ee572ccd77051080254a0cf86c78ce3938 100755 (executable)
--- a/schema/ssh/authorized_keys/*/pub/check
+++ b/schema/ssh/authorized_keys/*/pub/check
@@ -1,7 +1,7 @@
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]

-if {! [regexp {^ssh-ed25519 [.A-Za-z0-9/+]{68,68}} $n]} {
+if {![regexp {^ssh-ed25519 [.A-Za-z0-9/+]{68,68}} $n]} {

     puts {bad ssh-ed25519 key}
     exit 1
 }
     puts {bad ssh-ed25519 key}
     exit 1
 }

diff --git a/schema/ssh/enabled/check b/schema/ssh/enabled/check
index f9a1b3b7310070e1293443dc329bdba0af590b866fe3285f311dc7b8fe48b080..f4de234006119ec40950d370c808bb48a7ad0bd3c8532911ea5847c0e8d181a9 100755 (executable)
--- a/schema/ssh/enabled/check
+++ b/schema/ssh/enabled/check
@@ -4,7 +4,7 @@ set n [read -nonewline stdin]
 if {$n == ""} {
     set n no
 }
 if {$n == ""} {
     set n no
 }

-if {! [string is boolean $n]} {
+if {![string is boolean $n]} {

     puts {is not boolean}
     exit 1
 }
     puts {is not boolean}
     exit 1
 }

diff --git a/schema/ssh/port/check b/schema/ssh/port/check
index 6bbe324d0879c9c99b7d49f8e7690a2bb4969bcb03e4ede50a94b73af11a7cf9..45d5c59bd9feb45b8f5168905a4e596661cd63aaf5239543c5d7cf571403fa8b 100755 (executable)
--- a/schema/ssh/port/check
+++ b/schema/ssh/port/check
@@ -4,7 +4,7 @@ set n [read -nonewline stdin]
 if {$n == ""} {
     set n 22
 }
 if {$n == ""} {
     set n 22
 }

-if {! [string is integer -strict $n]} {
+if {![string is integer -strict $n]} {

     puts "invalid integer"
     exit 1
 }
     puts "invalid integer"
     exit 1
 }

diff --git a/schema/ssh/pub/check b/schema/ssh/pub/check
index 158ef733b765130fe8285dc54b5769caa373124a9276e66c822d07a711c3ce9c..11bef2837aff0d7608333ead7a7582ee572ccd77051080254a0cf86c78ce3938 100755 (executable)
--- a/schema/ssh/pub/check
+++ b/schema/ssh/pub/check
@@ -1,7 +1,7 @@
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]
 #!/usr/bin/env jimsh
 
 set n [read -nonewline stdin]

-if {! [regexp {^ssh-ed25519 [.A-Za-z0-9/+]{68,68}} $n]} {
+if {![regexp {^ssh-ed25519 [.A-Za-z0-9/+]{68,68}} $n]} {

     puts {bad ssh-ed25519 key}
     exit 1
 }
     puts {bad ssh-ed25519 key}
     exit 1
 }

diff --git a/schema/sys/hostname/check b/schema/sys/hostname/check
index fcaf6fa6b7c782c866ab0e3b48b0b3033beeda0b6913c4fdffafa97b3d0614aa..c4e2443d0e50c9a612bcf3f58a3a929ac3df043647b1d955dc22e1109f410c1b 100755 (executable)
--- a/schema/sys/hostname/check
+++ b/schema/sys/hostname/check
@@ -4,7 +4,7 @@ set n [read -nonewline stdin]
 if {$n == ""} {
     set n unknown
 }
 if {$n == ""} {
     set n unknown
 }

-if {! [regexp {^[a-z0-9]{1,32}$} $n]} {
+if {![regexp {^[a-z0-9]{1,32}$} $n]} {

     puts {does not match ^[a-z0-9]{1,32}$}
     exit 1
 }
     puts {does not match ^[a-z0-9]{1,32}$}
     exit 1
 }

diff --git a/schema/ui/password/check b/schema/ui/password/check
index f09d95be6f428c12fdf36a96d8c1cdcf1c67306e3e5dee7834717f0e977e73fd..09f8e62d3ab8ef63543cb6b7f3a93288587617bbd22b26cda1bcc4f569d5f451 100755 (executable)
--- a/schema/ui/password/check
+++ b/schema/ui/password/check
@@ -4,7 +4,7 @@ set passwd [read -nonewline stdin]
 if {$passwd == ""} {
     set passwd admin
 }
 if {$passwd == ""} {
     set passwd admin
 }

-if {! [regexp {^[0-9a-z-]{1,64}$} $passwd]} {
+if {![regexp {^[0-9a-z-]{1,64}$} $passwd]} {

     puts {does not match ^[0-9a-z-]{1,64}$}
     exit 1
 }
     puts {does not match ^[0-9a-z-]{1,64}$}
     exit 1
 }