expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved text block to common location

Browse Source
This commit is contained in:
Philip Sargent
2025-06-24 22:45:34 +03:00
parent e8f3526967
commit 4cbad79a30
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
handbook/computing/bulkupdatelaptop.html
View File

@@ -74,6 +74,37 @@ You can do this entirely on your own if you have access to the <i>expo laptop</i
<li>If you are also planning on extensive work rewriting parts of the handbook, then you will also need the <a href="../computing/repos.html">expo repository</a> <var>expoweb</var>.
</ol>
<h3 id="process">The complete process sequence</h3>
<p>Whatever software you use, and whether you are using a Mac, Chromebook, Windows, Android, HarmonyOS or Linux, this is the procedure you need to follow.
<ol>
<li>Get the files you are going to edit onto your personal device (using scp, filezilla or git; or even wget or curl)
<li>Edit the files on your device
<li>either
<ul>
<li>git add the files to your local git repo
<li>git commit -m "this is my edit, I changed..."
<li>git push<br>
which will upload your edited file and also register it in the version control system on the server
</ul>
<li>or
<ul>
<li>upload the edited file with scp or filezilla
<li>login to the server using ssh (or PuTTY on Windows)
<li><em>on the server:</em>:
<ul>
<li>cd expoweb (if editing handbook), or cd loser (if editing survex files), or cd drawings (if editing drawings) - wherever you uploaded the files to
<li>git add the files to the server git repo
<li>git commit -m "this is my edit, I changed..., my name is [Inigo Montoya]"
<br>
which will register your edited file in thee version control system on the server.
<li>This is all VITAL otherwise all the online forms that attempt to upload files for ordinary (non-bulk update) users will fail because the got repo you have uploaded to is not in he expected state.
</ul>
</ul></ol>
<p>Note that the <var>:drawings:</var> repo also contains all the wallets' configurations for all years, so if you screw up the drawings repo state, none of the online wallets updating stuff will work.
<h4>For Linux users only:</h4>
<ul>
<li><a href="https://git-scm.com/download/gui/linux">GUI for git</a> - There is a choice on Linux but many people just use the command line.

32
handbook/computing/winlaptop.html
View File

@@ -139,39 +139,15 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
<h3 id="process">The complete process sequence</h3>
<p>Whatever software you use, this is the procedure you need to follow.
<ol>
<li>Get the files you are going to edit onto your personal device (using scp, filezilla or git; or even wget or curl)
<li>Edit the files on your device
<li>either
<ul>
<li>git add the files to your local git repo
<li>git commit -m "this is my edit, I changed..."
<li>git push<br>
which will upload your edited file and also register it in the version control system on the server
</ul>
<li>or
<ul>
<li>upload the edited file with scp or filezilla
<li>login to the server using ssh (or PuTTY on Windows)
<li><em>on the server:</em>:
<ul>
<li>cd expoweb (if editing handbook), or cd loser (if editing survex files), or cd drawings (if editing drawings) - wherever you uploaded the files to
<li>git add the files to the server git repo
<li>git commit -m "this is my edit, I changed..., my name is [Inigo Montoya]"
<br>
which will register your edited file in thee version control system on the server.
<li>This is all VITAL otherwise all the online forms that attempt to upload files for ordinary (non-bulk update) users will fail because the got repo you have uploaded to is not in he expected state.
</ul>
</ul></ol>
<p>Note that the <var>:drawings:</var> repo also contains all the wallets' configurations for all years, so if you screw up the drawings repo state, none of the online wallets updating stuff will work.
<p>This is the same whatever operating system you are using, see <a href="bulkupdatelaptop.html#process"> process sequence</a>. Whatever software you use, that is the procedure you need to follow.
<h3 id="problems">Things that cause problems</h3>
<h4>git state incompletely tidied up</h4>
<p>
See <a href="#process">complete process sequence </a> above.
See <a href="bulkupdatelaptop.html#process">complete process sequence </a> as mentioned above.
<h4>Filenames</h4>
<p>Linux allows characters in filenames which Windows doesn't. There are also apparently normal filenames which Windows rejects (such as "<a href="https://answers.microsoft.com/en-us/windows/forum/windows_7-files/why-cant-i-create-a-folder-with-name/23c86662-4988-4c7d-9c2d-3e33d4413de3">CON</a>") for historical reasons. Linux filenames are case-senstitive and Windows filenames aren't: beware.