Merge branch 'tidy' into 'main'

Fixes to build-sh arising from release process for 1.1.0

See merge request yarrg/jarrg!6

diff --git a/build-sh b/build-sh
index 9c57874100e11f669d03c3ba249645f0b4662daf..39a2be28c43817499fa9548248e975f1535b637f 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -17,6 +17,7 @@ revision=`git describe --always || echo '(unknown revision)'`
 if [ x"`git diff 2>/dev/null || echo x`" != x ]; then
        revision="$revision-local"
 fi
+revision=${revision#jarrg-}
 
 cat >src/net/chiark/yarrg/Version.java <<END
   package net.chiark.yarrg;
@@ -57,7 +58,7 @@ Generated OK:
 "
 ls -al $files
 
-pubbase="${JARRG_PUBLISH_BASE-login.chiark.greenend.org.uk}"
+pubbase="${JARRG_PUBLISH_BASE-ijackson@login.chiark.greenend.org.uk}"
 pubdir="${JARRG_PUBLISH_DIR-/home/yarrgweb/public-html/download/jarrg}"
 
 echo "
@@ -68,6 +69,6 @@ Publish as test with:
 
 To actually publish a release, on $pubbase:
   mkdir $revision
-  ln tests/* $revision/.
-  ln -f tests/* .
+  ln test/* $revision/.
+  ln -f test/* .
 "