From 548cde42b79a3c0e57ce005909db6967324d582c Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Fri, 20 Dec 2024 17:23:17 +0000
Subject: [PATCH] trying to make this work better - online edit of
 handbook/troggle/troglaptop.html
 [PosixPath('/home/philip/expoweb/handbook/troggle/troglaptop.html')]

---
 handbook/troggle/troglaptop.html | 41 +++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/handbook/troggle/troglaptop.html b/handbook/troggle/troglaptop.html
index 97abd664b..5700b625a 100644
--- a/handbook/troggle/troglaptop.html
+++ b/handbook/troggle/troglaptop.html
@@ -32,28 +32,30 @@ need to write any new software for what you need to do. Look at the tools and re
 <h3>Short-cut</h3>
 If you have never done any bulk updates, and don't understand git, but want to look at the code and maybe run it, 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
+<pre><code>mkdir ~/expo
+cd ~/expo
+git clone http://expo.survex.com/repositories/troggle/.git trog-temp</code></pre>
+  This will create <var>~/expo/trog-temp/</var> and get you a copy of the configuration scripts
   <ul><var>
-    <li>troggle/_deploy/wsl/os-trog24.04.sh
-    <li>troggle/_deploy/wsl/os-survey.sh
-    <li>troggle/_deploy/wsl/venv-trog.sh
+    <li>trog-temp/_deploy/wsl/os-trog24.04.sh
+    <li>trog-temp/_deploy/wsl/os-survey.sh
+    <li>trog-temp/_deploy/wsl/venv-trog.sh
     </var>
   </ul>
   but you need to make them executable before they will work:
-  <pre><code>$ cd ~/expo/troggle
-cp _deploy/wsl/*.sh .
-$ chmod +x *.sh</code></pre>
-  Now go to <a href="#scripts">scripts</a>
+  <pre><code>mv ~/expo/trog-temp/_deploy/wsl/*.sh ~/expo
+cd ~/expo
+chmod +x *.sh
+rm -fr trog-temp</code></pre>
+  Now go to <a href="#scripts">scripts</a>.<br/> [ Yes
+  it's a pain having to clone the whole repo just to get only 4 scripts. But getting a repo in this way gets it in a config that means you can't work with it (maybe a git nerd can edit this page to tell us how to do that). We have to clone it properly using ssh to do that . Alternatively you can get the first script by cutting and pasting from the webpage at <a href="https://expo.survex.com/repositories/troggle/.git/tree/_deploy/wsl/os-trog24.04.sh">expo.survex.com/repositories/troggle/.git/tree/_deploy/wsl/os-trog24.04.sh</a> ]
 </div>
 
 <h3>Read more here..</h3>
 <p>This page is a work in progess. Text will be moved here from
 
 <pre>
-http://expo.survex.com/repositories/troggle/.git/tree/README.txt
+<a href="http://expo.survex.com/repositories/troggle/.git/tree/README.txt">expo.survex.com/repositories/troggle/.git/tree/README</a>
 </pre> 
 <img src="https://www.debian.org/logos/openlogo-100.jpg" align="right"  hspace="20" alt='debian logo'>
 
@@ -114,23 +116,28 @@ provisioning so that systems are rebuilt cleanly. <a href="http://www.cuyc.org.u
   development system. We should copy that in the first instance. Alas, we haven't got around to doing any of this yet. However <var>uv</var> now makes everything much, much simpler than when were were using <var>pip</var>.
 
 <h2 id="git">Configuring ubuntu</h2>
+<p>Set up the key-exchange first. You need to be able to ssh into the server to run this next bit.
+  
 <p>In your home folder run <br>
 ~$ <var>bash os-trog24.04.sh</var>
-  <br>copy it from the .git repo online to get hold of it. Run it in <var>/home/username</var> and it will create a folder <var>expo</var> and clone all the repositories into it after installing the software you need. It installs some of <var>expofiles</var> but not <var>expofiles/photos/</var>.
+  <br>you will hve this in your troggle folder is you have copied it from _deploy (see instructions above) or you can copy it from the .git repo online to get hold of it. Run it in <var>/home/username/expo</var> and it will clone all the repositories into it after installing the software you need. It installs some of <var>expofiles</var> but not <var>expofiles/photos/</var>.
 
 <h4>key exchange</h4>
-<p>You need this so that you can upload your edited code to the git repo on the server.
+<p>You absolutely need this so that you can upload your edited code to the git repo on the server. And currently the initial download and setup requires it too.
 <p>Follow this link to <a href="../computing/keyexchange.html">register a key with the expo server</a> to get git access if you have 
 not already cloned the <var>:troggle:</var> repo. 
 
 <h4>Set your indentity</h4>
 <p>On a new machine you need to configure your git identity:
-  <pre><code>git config --global user.email "you@example.com"
-git config --global user.name "Your Name"
+  <pre><code>git config --global user.email "<font color=blue>anathema.device@example.com</font>"
+git config --global user.name "<font color=blue>Anathema Device</font>"
 git config --global pull.rebase true
 </code></pre>
 
-
+<p>On WSL you will need to check that the key that you paired is actually loaded:<pre><code>chmod 700 ~/.ssh/*
+eval `ssh-agent`
+ssh-add ~/.ssh/<font color=blue>anathema@device</font></code></pre>
+  
 
 <h4 id="EXPOFILESREMOTE">Remote EXPOFILES</h4>
 <p>If you do not have a local copy of the 40GB /expofiles/, don't worry. Later on we can set <var>'EXPOFILESREMOTE = True'</var> in the