X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fdictionary-manager;h=a0eff44cfca90603be623daa7f9a6c3cddb4663c;hp=2231266edc8f0e0ef441067a7e5ffd276ba52ba6;hb=13931006f26ed2707664989b5adb5ed893054dc2;hpb=872e647cac241531e4599c8b8b330d8772020253

diff --git a/yarrg/dictionary-manager b/yarrg/dictionary-manager
index 2231266..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
@@ -508,13 +510,7 @@ proc upload_init {} {
     }
     if {$privacy_setting} {
 	package require http
-	::http::config -urlencoding utf-8
-	set ua [::http::config -useragent]
-	debug "USERAGENT OLD \"$ua\""
-	set ua [exec ./database-info-fetch useragentstringmap $ua \
-		    dictionary-manager 2>@ stderr]
-	::http::config -useragent $ua
-	debug "USERAGENT NEW \"$ua\""
+	httpclientsetup dictionary-manager
     }
 }
 
@@ -1314,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"