diff --git a/handbook/computing/winlaptop.html b/handbook/computing/winlaptop.html index 0a534f1a9..cad33f8bf 100644 --- a/handbook/computing/winlaptop.html +++ b/handbook/computing/winlaptop.html @@ -133,7 +133,7 @@ to Idiots guide to setting up git for expo - - PDF - Brendan's guide. Uses puTTY and GitKraken on WIndows. Read this, but most people will need to use VS Code instead of Git Kraken. + - PDF - Brendan's guide. Uses puTTY and GitKraken on Windows. Read this, but most people will need to use VS Code instead of Git Kraken.

Some software, such as the commercial (but free) GitKraken, requires that you click a checkbox to say that you are "using local SSH agent" rather than specifying ssh private keys explicitly (File->Preferences->Authentication in GitKraken). @@ -141,31 +141,32 @@ to The complete process sequence

Whatever software you use, this is the procedure you need to follow.

    -
  1. Get the files you are going to edit onto your personal device (using scp, filezilla or git) +
  2. Get the files you are going to edit onto your personal device (using scp, filezilla or git; or even wget or curl)
  3. Edit the files on your device
  4. either
    • git add the files to your local git repo
    • git commit -m "this is my edit, I changed..."
    • git push
      - which will upload your edited file and also register it in ther version control system on the server + which will upload your edited file and also register it in the version control system on the server
  5. or
    • upload the edited file with scp or filezilla -
    • login to the server using ssh (or putty on Windows) +
    • login to the server using ssh (or PuTTY on Windows)
    • on the server::
      • cd expoweb (if editing handbook), or cd loser (if editing survex files), or cd drawings (if editing drawings) - wherever you uploaded the files to
      • git add the files to the server git repo
      • git commit -m "this is my edit, I changed..., my name is [Inigo Montoya]"
        - which will register your edited file in thee version control system on the server.
        This is 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. + which will register your edited file in thee version control system on the server. +
      • 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.
-

Note that the :drawings: 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. +

Note that the :drawings: 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.

Things that cause problems

git state incompletely tidied up

@@ -184,7 +185,7 @@ The links you are most likely to come across are that what looks like and that expoweb/essentials.gpx is a link to the file /home/expo/expofiles/gpslogs/essentials/essentials2019.gpx -

But that example is in the :expoweb: repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP. +

But that example is in the :expoweb: repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP.

@@ -218,7 +219,8 @@ it downloads a copy of the contents of essentials.gpx and not a link.

Level 02 - Windows Bulk Synchronisation with rsync

TLDR just don't do this: please. -

When using Windows please, please +

TLDR never, ever, under any circumstances, use rsync on any of the repos folders.
rsync should only ever be used for expofiles/ +

When using Windows please, please