From: Ian Jackson Date: Wed, 29 Jul 2009 14:47:07 +0000 (+0100) Subject: Rename many things from PCTB to YARRG X-Git-Tag: 3.0~14 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=33f3a4cd5821208321f0bf61e2ae6c07504c8b86 Rename many things from PCTB to YARRG --- diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor index 350ef36..827cac4 100755 --- 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 1fe408f..42bd45d 100755 --- 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 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(); diff --git a/yarrg/database-info-fetch b/yarrg/database-info-fetch index 2e195c7..86e3d5f 100755 --- 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 5501765..c8e003d 100755 --- 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 98e64d5..eee7d14 100755 --- 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;