X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fdictionary-manager;h=a0eff44cfca90603be623daa7f9a6c3cddb4663c;hp=623e07dc0f5431d3d33b22c075183fb5a615444c;hb=2479b4aaac4d6b34d3095ecfdf6cf0712bcccc53;hpb=7414b6a2149cdf3a089d6c3afaaf21329f926ec1 diff --git a/yarrg/dictionary-manager b/yarrg/dictionary-manager index 623e07d..a0eff44 100755 --- a/yarrg/dictionary-manager +++ b/yarrg/dictionary-manager @@ -31,6 +31,8 @@ # ./dictionary-manager --approve-updates '' . . +source yarrglib.tcl + # invocation: # OUT OF DATE @@ -450,14 +452,14 @@ proc required/pixmap {} { set col 0; foreach {colname coldesc rows} $alloptions { debug "INIT $col $colname \"$coldesc\"" label .pe.grid.t$col -text $colname - listbox .pe.grid.l$col + listbox .pe.grid.l$col -height -1 foreach {rowname rowdesc} $rows { debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\"" .pe.grid.l$col insert end $rowdesc } bind .pe.grid.l$col <> [list pixmap_select $col] grid .pe.grid.t$col -column $col -row 0 - grid .pe.grid.l$col -column $col -row 1 + grid .pe.grid.l$col -column $col -row 1 -sticky ns incr col } pixmap_maybe_ok @@ -508,7 +510,7 @@ proc upload_init {} { } if {$privacy_setting} { package require http - ::http::config -urlencoding utf-8 + httpclientsetup dictionary-manager } } @@ -1308,13 +1310,13 @@ proc main/approve {} { manyset $argv userhost directory dictdir debug "APPROVER FOR $userhost $directory $dictdir" - set cmd [list tclsh $directory/dictionary-manager] - if {$debug} { lappend cmd --debug-server } - lappend cmd --remote-server-1 $directory $dictdir + set cmd "cd $directory && tclsh ./dictionary-manager" + if {$debug} { append cmd " --debug-server" } + append cmd " --remote-server-1 $directory $dictdir" switch -glob $userhost { {} { } {* *} { set cmd $userhost } - * { set cmd [concat [list ssh -o compression=yes $userhost] $cmd] } + * { set cmd [list ssh -o compression=yes $userhost $cmd] } } debug "APPROVER RUNS $cmd"