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

cross-references fixed and moving waffly stuff

Browse Source
This commit is contained in:
Philip Sargent
2019-12-05 02:10:31 +00:00
parent 57e05fc9f1
commit 533533c2ea
6 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
handbook/computing/yourlaptop.html
View File

@@ -17,7 +17,7 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
<li>Windows machines can do everything needed, but some useful software has no Windows version and you will need to find your own equivalents. There are also dangerous 'gotchas' to look out for because the file-naming system is different. Do use Linux instead if you can.
<li>WSL: the Windows Subsystem for Linux. The first release of this didn't do the ssh key exchange process easily. The <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">2019 WSL2 release</a> includes a complete Linux kernel. If you want to use this, then please do - and write the handbook documentation too. But beware, it can work in <a href="https://docs.microsoft.com/en-us/windows/wsl/wsl2-index">two different modes</a> which behave differently.
<li>WSL: the Windows Subsystem for Linux. The first release of this didn't do the ssh key exchange process easily. The <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">2019 WSL2 release</a> includes a complete Linux kernel. If you want to use this, then please do - and then write the handbook documentation too. But beware that it has <a href="https://docs.microsoft.com/en-us/windows/wsl/wsl2-index">two different modes</a> which behave differently.
<li>Mac users will need to use the Linux documentation as a guide and work it all out for themselves.
@@ -26,14 +26,15 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
<h3>Software</h3>
<p>Long-standing Expo policy is to retain absolute control of all software and all data. So we use <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS software</a> and we store data in text files not in a database. You can use other software on your own machine if it is format-compatible and exports data in the formats we want, but all the recommended software here is open source and please don't install proprietary software on the '<em>expo laptop</em>'.
<img src="https://survex.com/img/aven-1.2.37-by-date.png" align="right" width="200">
<p>The list of software:
<ul>
<li>mercurial
<li>git
<li>TortoiseHg
<li>scp and ftp GUI software, such as <a href="../fzconfig.html">Filezilla</a> - with a configuration file to get to the expo server
<li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git. Optional.
<li>Survex, including the Aven visualisation tool.
<li><a href="https://www.mercurial-scm.org/">mercurial</a> - distributed version control system
<li><a href="https://git-scm.com/">git</a> - distributed version control system
<li><a href="https://tortoisehg.bitbucket.io/">TortoiseHg</a> - GUI to mercurial
<li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git
<li>ftp GUI software, such as <a href="../fzconfig.html">Filezilla</a> - with a configuration file to get to the expo server
<li><a href="https://survex.com/download.html">Survex</a>, including the Aven visualisation tool.
<li><a href="https://github.com/CaveSurveying/tunnelx">Tunnel</a>: a Java 2.5D cave drawing program surveys based on Survex-compatible data which can also read PocketTopo files. (Generally called 'tunnel' even though the project and executable is actually 'tunnelx'.)
<li><a href="https://therion.speleo.sk/">therion.speleo.sk/</a>Therion - Therion processes survey data and generates maps or 3D models of caves.
<li><a href="https://www.qgis.org/en/site/">QGIS</a> - A Free and Open Source Geographic Information System
@@ -43,22 +44,22 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
<li>python, if you are extending troggle or the scripts in expoweb/noinfo/ - already installed on Linux
<li>python packages you will want to install: [<em>not yet documented</em>]
</ul>
<p>Nearly all the Austrian survey has beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.
<p>Nearly all our Austrian surveys have beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.
<p>For Windows users only:
<ul>
<li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> including pagent. Version 0.73 was released on 2019-09-29. You need this to generate and to use ssh keys on Windows.
<li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> including pagent. Version 0.73 was released on 2019-09-29. You need this to generate and to use ssh keys on Windows. Otherwise none of git, mercurial, scp, ftp or rsync will work.
<li><a href="https://gitforwindows.org/">Git for Windows</a>
<li><a href="https://www.python.org/downloads/windows/">python for windows</a>. We are using python 2.7 not 3.8.
<li>WinScp can be used instead of Filezilla, see
<li>WinScp can be used instead of Filezilla, - needs an <a href="computing/keyexchange.html">ssh key</a> installed.
</ul>
<p>For Android phones:
<ul>
<li><a href="ftpusage.html">FTP using Cx_File_Explorer</a> (this is probably out of date)
<li><a href="https://www.termius.com/">Terminus</a> - command line ssh to login to the expo server.
<li><a href="https://www.termius.com/">Terminus</a> - command line to create a key for your phone and to ssh login to the expo server.
<li>OsmAnd - GPS app. See separate pages on using GPS software
<li><a href="../uploading.html#android">andftp</a> app
<li><a href="../uploading.html#android">andftp</a> app - needs an <a href="computing/keyexchange.html">ssh key</a> installed on your phone
<li><a href="https://sites.google.com/site/speleoapps/home">TopoDroid</a> makes cave surveys with the DistoX.
<li><a href="https://sites.google.com/site/speleoapps/home">Cave3D</a> is a Therion 3D viewer.
<li><a href="https://sites.google.com/site/speleoapps/home">ThManager</a> organizes single surveys, exported by TopoDroid, into Therion projects encoded by Therion "thconfig" files.
@@ -83,13 +84,17 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
<h3>Configuration</h3>
You need to do the
<a href="computing/keyexchange.html">key exchange</a> process - which you can only do 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.
<a href="keyexchange.html">key exchange</a> procedure - which you can only do 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. Do this first, Without it none of git, mercurial, scp, ftp or rsync will work.
<p>On a Windows machine you will need to configure pageant (the putty authentication agent)
to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-keys.html">run at startup to load your key</a>. Note that you are loading your <em>private</em> key, the .ppk file, into pageant and that this key never leaves your laptop.
<p>When using Windows please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a>.
<p><a href="../tortoise/tortoise-win.htm">Installing TortoiseHg and PuTTy on Windows</a> - full illustrated instructions.
<p><a href="../fzconfig.html">Installing Filezilla</a> - - full illustrated instructions.
<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="../manual.html#quickstart">exceptionally careful when using rsync</a>.
<p>The handbook has extensive documentation on when and where it is necessary to use scp and ftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, a href="../uploading.html">Uploading files</a> and <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key exchange process can do scp, ftp or rsync.
@@ -97,13 +102,15 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
<img src="/expofiles/tunnelwiki/wiki/images/6/65/Banner204.png" align="right" width=100>
<p>For Survex, Tunnel and Therion, see the <a href="http://expo.survex.com/handbook/survey/">Expo Surveying Handbook</a>.
<p><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.
<p><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.</em>
<p><a href="http://expo.survex.com/expofiles/tunnelwiki/wiki/pages/Tunnel.html">The Tunnel tutorial</a> - installation notes and a wiki of examples and tutorials
<p><a href="https://bitbucket.org/goatchurch/tunnelx/src/default/">bitbucket.org/goatchurch/tunnelx</a> - documentation and source code in the bitbucket repository system.
<h3>Cheat lists and quick reminders</h3>
<p>Quick <a href="qstart-hg.html">reminders for using mercurial</a> at the command line.
<p>Full instructions for <a href="../tortoise/tortoise-win.htm">installing TortoiseHg and PuTTy on Windows</a>
<p>Quick <a href="../manual.html#quickstart">reminders for using rsync and mercurial</a> at the command line.
<hr />
<div id="menu">