X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fupload;h=db82c6910c88caf468fd3f93ded34a1019ce0d0b;hb=2fc281fdc41a5e7b97550cda3806c903b8a7ae9b;hp=5eff2c476b623a40d1759f289caf2b3229305566;hpb=217c3f380224552600f0698934849bce61b6650b;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/upload b/yarrg/web/upload
index 5eff2c4..db82c69 100755
--- a/yarrg/web/upload
+++ b/yarrg/web/upload
@@ -34,6 +34,11 @@
 
 </%doc>
 <& docshead &>
+<%perl>
+my $url_base_base= 'http://yarrg.chiark.net/download/jpctb';
+my $download_version= 'test';
+my $url_base= "$url_base_base/$download_version";
+</%perl>
 <h1>Uploading to YARRG</h1>
 <p>
 
@@ -84,9 +89,10 @@ report the problem to us, not to Three Rings.
 <h3>Installing and running on Linux</h3>
 
 Download
-<a href="http://yarrg.chiark.net/download/jpctb/test/jpctb.tar.gz">http://yarrg.chiark.net/download/jpctb/test/jpctb.tar.gz</a>
+<a href="<% $url_base %>/jpctb.tar.gz"><% $url_base %>/jpctb.tar.gz</a>
 and unpack it.  You run it from the command line.  Change
-to the directory where you unpacked the tarball above, and then run
+(<code>cd</code>) to the top level <code>jpctb</code> directory
+which was created when you unpacked the tarball, and then run
 <pre>
 ./jpctb /path/to/yohoho/yohoho
 </pre>
@@ -97,7 +103,7 @@ ordinary Puzzle Pirates startup script, which is normally
 <h3>Installing on Windows</h3>
 
 Download
-<a href="http://yarrg.chiark.net/download/jpctb/test/jpctb-setup.exe">http://yarrg.chiark.net/download/jpctb/test/jpctb-setup.exe</a>
+<a href="<% $url_base %>/jpctb-setup.exe"><% $url_base %>/jpctb-setup.exe</a>
 and double-click on it.  It will either:
 <ol>
 <li>Just work, in which case you'll have a new icon on your desktop which
@@ -149,7 +155,7 @@ it is still possible to launch Puzzle Pirates <em>without</em> JPCTB
 (for example, in case the JPCTB client should cause any kind of
 problem).
 
-<h2>Authorship and source code</h2>
+<h2>Authorship, source code and other versions</h2>
 
 Thanks to Burninator for writing the core of the JPCTB client.  Ian
 Jackson and Owen Dunn adapted it to improve the installation setup (in
@@ -169,11 +175,18 @@ the MIT-style two-clause licence.
 
 <p>
 
+The download directory can contains other versions (eg unreleased test
+versions), which you can see here:
+ <a href="<% $url_base_base %>/"><% $url_base_base %>/</a> .
+
+<p>
+
 The source code for the downloadable released binaries is in the
-<a href="http://yarrg.chiark.net/download/jpctb/test/jpctb.tar.gz">Linux
+<a href="<% $url_base %>/jpctb.tar.gz">Linux
 tarball</a>.  We maintain YARRG JPCTB in git, and you can get
 source code for recent and perhaps unreleased versions from
-<code>git://git.yarrg.chiark.net/jpctb.git</code>.
+<code>git://git.yarrg.chiark.net/jpctb.git</code> and/or
+<code>git://git.chiark.greenend.org.uk/~ijackson/jpctb.git</code> .
 
 
 </div>