From: Ian Jackson <ywiivi@fyvzl.net>
Date: Sun, 9 Apr 2023 09:56:43 +0000 (+0000)
Subject: Merge branch 'tidy' into 'main'
X-Git-Tag: jarrg-1.1.1^0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=f3c3e5dedb03b6b0de6dc5166d9006226c4ab506;hp=b4e209b67229f22b69514ded4bf494f54c3d52fc;p=jarrg-ian.git

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 9c57874..39a2be2 100755
--- 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/* .
 "