X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fconvert.c;h=782167f8312bdb9461f45e835c3beadbcae3904d;hp=93b1a2fecefbf40b59c7bba8b779b6936d7e93c9;hb=33f3a4cd5821208321f0bf61e2ae6c07504c8b86;hpb=93732484adcab512e594a928af2536955e8d6cab

diff --git a/yarrg/convert.c b/yarrg/convert.c
index 93b1a2f..782167f 100644
--- a/yarrg/convert.c
+++ b/yarrg/convert.c
@@ -116,10 +116,10 @@ static void rsync_core(const char *stem, const char *suffix,
 
   sysassert( (fetcher= fork()) != -1 );
   if (!fetcher) {
-    const char *rsync= getenv("YPPSC_PCTB_RSYNC");
+    const char *rsync= getenv("YPPSC_YARRG_RSYNC");
     if (!rsync) rsync= "rsync";
   
-    const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
+    const char *src= getenv("YPPSC_YARRG_DICT_UPDATE");
     char *remote= masprintf("%s/master-%s.txt%s", src, stem, suffix);
     char *local= masprintf("_master-%s.txt%s", stem, suffix);
     if (DEBUGP(rsync))
@@ -252,17 +252,17 @@ int main(int argc, char **argv) {
 
   /* Defaults */
   
-  set_server("YPPSC_PCTB_PCTB",
+  set_server("YPPSC_YARRG_PCTB",
 	     "http://",          "pctb.ilk.org" /*pctb.crabdance.com*/,
 	                         "pctb.ilk.org",
 	     o_serv_pctb,        o_flags & (ff_needisland|ff_upload));
 	     
-  set_server("YPPSC_PCTB_DICT_UPDATE",
+  set_server("YPPSC_YARRG_DICT_UPDATE",
 	     "rsync://",         "rsync.pctb.chiark.greenend.org.uk/pctb",
 	                         "rsync.pctb.chiark.greenend.org.uk/pctb/test",
 	     o_serv_dict_fetch,   o_flags & ff_dict_fetch);
 
-  set_server("YPPSC_PCTB_DICT_SUBMIT",
+  set_server("YPPSC_YARRG_DICT_SUBMIT",
 	     "http://",           "dictup.pctb.chiark.greenend.org.uk",
 	                          "dictup.pctb.chiark.greenend.org.uk/test",
 	     o_serv_dict_submit,  o_flags & ff_dict_submit);
@@ -307,7 +307,7 @@ int main(int argc, char **argv) {
   }
   if (o_mode & mf_readscreenshot) {
     if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
-      badusage("must not reuse screenshots for upload to live PCTB database");
+      badusage("must not reuse screenshots for upload to live databases");
     open_screenshot_file(0);
     if (o_flags & ff_singlepage) read_one_screenshot();
     else read_screenshots();