Rename many things from PCTB to YARRG

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index 350ef366d0baa6fda394e4105a4ca624c6008681..827cac45ebfc05ac9a5a628d15437d758a93de07 100755 (executable)
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -226,7 +226,7 @@ sub main__tsv () {
 }
 
 
-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};
+our ($pctb) = $ENV{'YPPSC_YARRG_PCTB'};
 
 our ($ua)= LWP::UserAgent->new;
 
@@ -310,11 +310,11 @@ sub read_newcommods ($) {
 }
 
 sub refresh_newcommods() {
-    my $rsync= $ENV{'YPPSC_PCTB_RSYNC'};
+    my $rsync= $ENV{'YPPSC_YARRG_RSYNC'};
     $rsync= 'rsync' if !defined $rsync;
 
     my $local= "_master-newcommods.txt";
-    my $src= $ENV{'YPPSC_PCTB_DICT_UPDATE'};
+    my $src= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
     if ($src) {
        my $remote= "$src/master-newcommods.txt";
        $!=0; system 'rsync','-Lt','--',$remote,$local;

diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver
index 1fe408f9d93c2603525405925c8646deaba8c038..42bd45dc29539cca3b9edc4b48af7f86d13ce636 100755 (executable)
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# This script is invoked when the YPP SC PCTB client uploads to
+# This script is invoked when the yarrg client uploads to
 # the chiark database.
 
 # This is part of ypp-sc-tools, a set of third-party tools for assisting

diff --git a/yarrg/convert.c b/yarrg/convert.c
index 93b1a2fecefbf40b59c7bba8b779b6936d7e93c9..782167f8312bdb9461f45e835c3beadbcae3904d 100644 (file)
--- 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();

diff --git a/yarrg/database-info-fetch b/yarrg/database-info-fetch
index 2e195c7a01b2d06471b540a3201721a39701aad2..86e3d5f2baa55843ba5a3a77cbc5643c7809d59e 100755 (executable)
--- a/yarrg/database-info-fetch
+++ b/yarrg/database-info-fetch
@@ -37,7 +37,7 @@ our ($which) = shift @ARGV;
 
 $which =~ s/\W//g;
 
-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};
+our ($pctb) = $ENV{'YPPSC_YARRG_PCTB'};
 our ($ua)= LWP::UserAgent->new;
 our $jsonresp;
 

diff --git a/yarrg/dictionary-manager b/yarrg/dictionary-manager
index 5501765992e14e21953238e4fce7724a4801bc32..c8e003dfa71f084cb9314efb5e3247b44f5350fc 100755 (executable)
--- a/yarrg/dictionary-manager
+++ b/yarrg/dictionary-manager
@@ -1,6 +1,6 @@
 #!/usr/bin/wish
 
-# helper program for OCR in PCTB upload client
+# helper program for OCR in yarrg upload client
 
 # This is part of ypp-sc-tools, a set of third-party tools for assisting
 # players of Yohoho Puzzle Pirates.
@@ -516,8 +516,8 @@ proc upload_status {} {
     # returns 0, 1, 2 for none, anon, with pirate name
     global env
 
-    if {![info exists env(YPPSC_PCTB_DICT_SUBMIT)]} { debug a; return 0 }
-    if {![string compare 0 $env(YPPSC_PCTB_DICT_SUBMIT)]} { debug b; return 0 }
+    if {![info exists env(YPPSC_YARRG_DICT_SUBMIT)]} { debug a; return 0 }
+    if {![string compare 0 $env(YPPSC_YARRG_DICT_SUBMIT)]} { debug b; return 0 }
 
     if {![info exists env(YPPSC_PIRATE)]} { return 1 }
     if {![info exists env(YPPSC_OCEAN)]} { return 1 }
@@ -550,7 +550,7 @@ proc maybe_upload_entry {im def} {
     }
     lappend pl entry [format_database_entry/$reqkind $im $def]
 
-    set url $env(YPPSC_PCTB_DICT_SUBMIT)
+    set url $env(YPPSC_YARRG_DICT_SUBMIT)
     append url dictionary-update-receiver
 
     set query [eval ::http::formatQuery $pl]

diff --git a/yarrg/dictionary-update-receiver b/yarrg/dictionary-update-receiver
index 98e64d5ef6e363a51e41198c71dcfb0b5ed97449..eee7d1464caaadba6834b3ca185f7f047afce60f 100755 (executable)
--- a/yarrg/dictionary-update-receiver
+++ b/yarrg/dictionary-update-receiver
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# This script is invoked when the YPP SC PCTB client talks to the
+# This script is invoked when the yarrg wants to send an update to the
 # dictionary server.  See README.privacy.
 
 # This is part of ypp-sc-tools, a set of third-party tools for assisting
@@ -28,7 +28,7 @@
 
 # upload testing runes:
 #
-# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./yarrg --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv  
+# YPPSC_YARRG_DICT_UPDATE=./ YPPSC_YARRG_DICT_SUBMIT=./ ./yarrg --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv  
 # ./dictionary-manager --debug --approve-updates '' . .
 
 use strict (qw(vars));
@@ -187,7 +187,7 @@ my $version= param('version');
 my $spec_aadepth= param('depth');
 if ($version ne '3'  ||  $spec_aadepth ne $aadepth) {
     print header('text/plain',
-                "403 YPP SC PCTB client is out of date".
+                "403 yarrg client is out of date".
                 " ($version, $spec_aadepth)");
     print "\nYour YPP SC client is out of date.\n";
     exit 0;