From a10123ca46a1e7e08887e8609c4089466c7bd328 Mon Sep 17 00:00:00 2001 From: watts Date: Thu, 28 Aug 2025 16:59:31 +0200 Subject: [PATCH] Update Update-Pixelator-Version --- Update-Pixelator-Version.-.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Update-Pixelator-Version.-.md b/Update-Pixelator-Version.-.md index b66367c..3b8799b 100644 --- a/Update-Pixelator-Version.-.md +++ b/Update-Pixelator-Version.-.md @@ -35,14 +35,14 @@ The new code can be downloaded from `gitea.psi.ch`. There are 3 ways to do this: cd ~/work git clone https://gitea.psi.ch/MicroSpectro/Pixelator.git stxm-new-version ``` - replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful). When authenticating the git access, give your gitea user name and use the token as the password. + replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful, e.g. `stxm-20250401`). When authenticating the git access, give your gitea user name and use the token as the password. 2. Use the `git clone` command with an **ssh** link - requires [uploading your public key to gitea.psi.ch](https://gitea.psi.ch/user/settings/keys) ``` cd ~/work git clone git@gitea.psi.ch:MicroSpectro/Pixelator.git stxm-new-version ``` - replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful). + replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful, e.g. `stxm-20250401`). 3. Log in to gitea.psi.ch and use the blue `<> code` button menu to download a ZIP or TAR.GZ archive. If you want a special branch (to test a special feature still in development), then be sure to choose the branch before downloading the code. Copy the archive into the `work` directory. ``` @@ -59,7 +59,13 @@ The new code can be downloaded from `gitea.psi.ch`. There are 3 ways to do this: rm Pixelator-master.tar.gz ``` - replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful). + replace `stxm-new-version` with whatever directory name you wish to use (including the date is useful, e.g. `stxm-20250401`). Next, you need to copy the commit hash into `gen_version_hash.sh` into the place where you see lots of zeros. You can extract the commit hash from a ZIP archive (but not a TAR.GZ archive) with: + ``` + unzip -z Pixelator-master.zip + ``` +The other way is to copy it from the gitea.psi.ch web page when you are downloading the archive. It is a bit hidden and the easiest way to find it is to right click on the latest commit short-hash and copy the link. + + # Switch Branch (optional)