This commit is contained in:
Philip Sargent 2022-11-26 01:44:50 +00:00
parent 98546eb0a3
commit 1e6ac9cd13
2 changed files with 6 additions and 11 deletions

View File

@ -49,7 +49,7 @@ yet do everything on a phone, but you can do some things. See <a href="phone.htm
<h2><a name="software">Software</a></h2>
<p>You need three kinds of software
<ol>
<li>Encrypted keys to access the server (ssh). None of the rest works without this.
<li><a href="keyexchange.html">Encrypted keys</a> to access the server (ssh). None of the rest works without this.
<li>Version control software (<a href="https://git-scm.com/">git</a>) for the loser survex data files, drawings (tunnel, therion) files, website and handbook (expoweb) files.
<li>File-transfer tools scp, rsync and sftp (<a href="fzconfig.html">Filezilla</a>) for the files not under version control: photos, documents, scanned logbooks, scanned
raw survey notes (surveyscans), scanned cave centre-line plots and everything else. [Never use these on the version-controlled folders.]
@ -59,6 +59,9 @@ raw survey notes (surveyscans), scanned cave centre-line plots and everything el
<p>If you are only managing survey data then you probably don't need the file-transfer stuff.
<p>You need to <a href="keyexchange.html">register a key with the expo server</a> to get upload (i.e. read/write) access. Do this first, Without it none of git, scp, ftp or rsync will work.
You can do this entirely on your own if you have access to the <i>expo laptop</i> to upload and install the public key generated by your laptop.</p>
<h4>QMs and scripts</h4>
<p>You may not need a full troggle software development machine if you are only fixing a small script. If you are, you need
<ul>

View File

@ -62,18 +62,10 @@ complicated process. At a minimum you will be an experienced software nerd alrea
You will have done the ssh
<a href="keyexchange.html">key-pair setup</a> process - which you can only do entirely on your own if
you have access to the <i>expo laptop</i>.
<p>See <a href="basiclaptop.html">setting up a minimal laptop</a> for a short list of software. This assumes you know how to use it all.
<br />See <a href="surveylaptop.html">setting up your own survey laptop</a> for the full list of software we use and where to get it.
<p>See <a href="bulkupdatelaptop.html">setting up your own Bulk Update laptop</a> for the full list of software we use and where to get it.
<p>Note that the instructions are primarily for people using Linux with some help for those using Windows. If you are a Mac user then you are on your own.
<h3>Cheat lists and quick reminders</h3>
<p>If you know what you are doing here is the basic info on what's where:<br />
<ul>
<li>Quick <a href="qstart-git.html">reminders for using git</a> at the command line.
<li>Quick <a href="manual.html#quickstart">reminders for using rsync</a> at the command line.
</ul>
<hr/>