git without ssh - online edit of handbook/troggle/troglaptop.html [PosixPath('/home/philip/expo/expoweb/handbook/troggle/troglaptop.html')]

handbook/troggle/troglaptop.html

@@ -14,7 +14,7 @@
 
 
 <h2>Software development machine</h2>
-<p>For troggle itself, you need a linux machine. We all use Debian or Debian-derived machines (Debian itself, Ubuntu, Xubuntu etc.) but other forms of linux may work. Running Debian or Ubuntu under WSL on Windows 10 works fine.
+<p>For troggle itself, you need a linux machine. We all use Debian or Debian-derived machines (Debian itself, Ubuntu, Xubuntu etc.) but other forms of linux may work. Running Debian or Ubuntu under WSL on Windows 10 or 11 works fine.
 <p>If you want to work on the troggle source code and be able to commit to the server git repo,
 your account will need to be added to the troggle project members list. Contact wookey  at wookware dot org to get this set up.
 
@@ -26,8 +26,27 @@ need to write any new software for what you need to do. Look at the tools and re
 <p>Maybe what you need is simply some fixes or workarounds in the imported data files, not in the python code.
 
 <h3>Prerequisites</h3>
-<p>You need to already know really quite a lot about what troggle does, and how it is used in practice. Also you will have installed quite a lot of the software such as tunnel, therion, survex etc. as documented in <a href="../computing/bulkupdatelaptop.html">your bulk update laptop configuration</a>. In particular read the information there about VS code and git.
+<p>You need to already know really quite a lot about what troggle does, and how it is used in practice. Also you will have installed git and set up the key-pair as documented in <a href="../computing/bulkupdatelaptop.html">your bulk update laptop configuration</a>. In particular read the information there about VS code and git.
 
+<div style="margin-left: 10%">
+<h3>Short-cut</h3>
+If you have never done any bulk updates but want to look at the code, then there is a shortcut. You do not actually need to do all the Bulk Update machine configuration first.
+  <p>You can download the code without having a key-pair like this:
+<pre><code>$ mkdir ~/expo
+$ cd ~/expo
+$ git clone http://expo.survex.com/repositories/troggle/.git</code></pre>
+  This will create <var>~/expo/troggle/</var> and get you a copy of the configuration scripts
+  <ul><var>
+    <li>troggle/_deploy/wsl/os-trog24.04.sh
+    <li>troggle/_deploy/wsl/venv-trog24.04.sh
+    </var>
+  </ul>
+  but you need to make them executable before they will work:
+  <pre><code>$ cd ~/expo/troggle
+$ chmod +x *.sh</code></pre>
+</div>
+
+<h3>Read more here..</h3>
 <p>This page is a work in progess. Text will be moved here from
 
 <pre>
@@ -80,7 +99,7 @@ which you can read without installing by looking in:<br>
 <p>You will run <var>os-trog24.04.sh</var> just once to install all the basics,and you will run <var>venv-trog.sh</var> just once initially. 
   <p>We have two configurations for the virtual environment: 'dev' which uses the latest python and Django for speed, and 'server' which mimics the versions currently running on the server. [In December 2024 Django is 5 releases ahead of the version on the server (5.1 versus 3.2). Each has a list of ancilliary packages with the appropriate versions in dev.toml and server.toml.] <var>venv-trog.sh</var> deals with all this python-specific stuff, libraries and Django plug-ins. 
 
-  <p><var>os-trog.sh</var> takes a few minutes initially, but then about an hour when it installs survex, therion and tunnel as these drag in a huge number of dependencies.
+    <p><var>os-trog.sh</var> takes a few minutes: it installs the subset of /expofiles/ you need to work with troggle. If you now want to install survex, therion etc. then run <var>os-survey.sh</var>as these drag in a huge number of dependencies.
     
     <h3>Why no Docker container?</h3>
 <p>Yes, it is true that this would greatly speed up on-boarding new programmers. Or <a href="https://podman.io/">podman</a>.