README | 2 +- default.zone.do | 2 +- rc.tcl | 6 +++--- diff --git a/README b/README index 5a1bb42def1700cdfe6aa200e3c4bf44d4ad89566e8f00663c01f44247e048d0..2654af7d1ef3abcad8b916ebb5a5d75dc0e908b26343c620dd5bb81c391881fb 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ Tcl script, sourcing the rc.tcl, containing various helper functions. It expects DOMAIN variable to be set. Initially that utility was written on zsh, but later it was replaced -with Tcl. +with Tcl, and then Jim Tcl. * fqdn(domain) -- prints fully-qualified domain name, taking either "domain.", or "@", or "subdomain" names diff --git a/default.zone.do b/default.zone.do index b4de77e3a59761c985be6ac0a4f34e3280b394880e781efa23ba8a10ad6e0587..110ee31a1bb7967c2c090ea58ec6c79d918ce0490c342b5e4d2ca9b2ac4b17c5 100755 --- a/default.zone.do +++ b/default.zone.do @@ -1,4 +1,4 @@ -#!/usr/bin/env tclsh +#!/usr/bin/env jimsh set env(PATH) "$env(HOME)/work/zeasypki:$env(PATH)" set DOMAIN [lindex $argv 1] exec redo-ifchange rc.tcl y $DOMAIN.tcl diff --git a/rc.tcl b/rc.tcl index 5123c9690219128014f1db8c8d53a8fd60064147532211caff368f69b0290a4d..c2e75ec23f0e608f46e8179a834031822efaf4e5e0289bbd348a3553210610a5 100644 --- a/rc.tcl +++ b/rc.tcl @@ -51,7 +51,7 @@ set dn [fqdn $dn] global DOMAIN if {$dn == "$DOMAIN."} { return @ } set domainLen [llength [split $DOMAIN .]] - return [join [lrange [split $dn .] 0 end-[expr $domainLen + 1]] .] + return [join [lrange [split $dn .] 0 end-[expr {$domainLen + 1}]] .] } proc mx {dn} { @@ -87,7 +87,7 @@ proc ssh {dn} { set dn [fqdn $dn] set fn ssh/[string trimright $dn .] if {![file exists $fn]} { return } - set fd [open "|ssh-keygen -f $fn -r $dn"] + set fd [open [list |ssh-keygen -f $fn -r $dn]] while {[gets $fd line] >= 0} { if {[string first "SSHFP 4 2" $line] == -1} { continue } puts "[shorten $dn] [lrange [split $line " "] 2 end]" @@ -133,7 +133,7 @@ } proc pgp {keyid {uid ""}} { if {$uid == ""} { set uid $keyid } - set fd [open "|gpg --export-options export-dane --export $keyid"] + set fd [open [list |gpg --export-options export-dane --export $keyid]] while {[gets $fd line] >= 0} { if {[string first $uid $line] != -1} { break } }