A few docs and Debian-related fixes

README.md

@@ -8,9 +8,9 @@ Labtainers include more than 35 cyber lab exercises and tools to build your own.
 * Automated assessment of student lab activity and progress
 * Individualized lab exercises to discourage sharing solutions
 
-Labtainers provide controlled and consistent execution environments in which students perform labs entirely within the confines of their computer, regardless of the Linux distribution and packages installed on the student's computer.  The only requirement is that the Linux system supports Docker.  See the Papers below for additional information about the framework.
+Labtainers provide controlled and consistent execution environments in which students perform labs entirely within the confines of their computer, regardless of the Linux distribution and packages installed on the student's computer.  The only requirement is that the Linux system supports Docker.  See the [Papers][Papers] for additional information about the framework.
 
-The Labtainers website, and the downloads are at https://my.nps.edu/web/c3o/labtainers.
+The Labtainers website, and the downloads are at <https://my.nps.edu/web/c3o/labtainers>.
 
 Distribution created: mm/dd/yyyy
 
@@ -184,3 +184,4 @@ January 24, 2018
 -  Ignore files in \_tar directories (other than .tar) when determining build
    dependencies.
 
+[Papers]: https://my.nps.edu/web/c3o/labtainers#papers

docs/labdesigner/labdesigner.tex

@@ -153,7 +153,7 @@
 The difference between the development kit and the standard Labtainer distribution is primarily
 just the lab definition files, which are withheld from the general distribution for efficiency.
 If you have a Labtainer installation, you can get the developer files by going to your
-labtainers directory, e.g., {\tt ~/labtainers} and running {\tt ./update-designer.sh}
+labtainers directory, e.g., {\tt \~{}/labtainers/} and running {\tt ./update-designer.sh}
 You may then want to logout and login again, or run a new {\tt bash} shell because that script
 sets some environment variables.
 
@@ -344,7 +344,7 @@ \subsection{Testing the new lab}
 \item labtainer.centos -- A CentOS server with systemd and the true ``init'' initial process.
 \item labtainer.lamp -- A CentOS server with Apache, Mysql and PHP, (the LAMP stack)
 \item labtainer.firefox -- An Ubuntu container with the Firefox browser.
-\item labtainer.wireshark -- The labtaienr.network with wireshark added.
+\item labtainer.wireshark -- The labtainer.network with wireshark added.
 \item labtainer.java -- An Ubuntu container with the Firefox browser and the open JDK.
 \item labtainer.kali -- A Kali Linux system with the Metasploit framework.
 \item labtainer.metasploitable -- The Metasploitable-2 vulnerable server.

docs/student/labtainer-student.tex

@@ -27,7 +27,7 @@ \subsection{Obtaining and installing Labtainers}
 \url{https://my.nps.edu/web/c3o/virtual-machine-images}, you may
 skip this section.
 The Labtainer framework is distributed as a tarball from:
-\url{https://my.nps.edu/web/cisr/labtainers}
+\url{https://my.nps.edu/web/cisr/labtainers}.
 Click the link named: ``Download the Labtainer framework'', and untar the resulting file into 
 a permanent directory on your Linux system, e.g., into \verb ~/home.  For example, if you downloaded the file
 from a browser on your Linux system:
@@ -36,7 +36,7 @@ \subsection{Obtaining and installing Labtainers}
    tar -xf ~/Downloads/labtainer.tar
 \end{verbatim}
 From the directory into which you untarred the
-tarball:
+tarball, start the installer script:
 \begin{verbatim}
    cd labtainer
    ./install-labtainer.sh

labs/telnetlab/config/about.txt

@@ -1 +1 @@
-Illustrates the telent protocol transmission of plain-text passwords.
+Illustrates the telnet protocol transmission of plain-text passwords.

setup_scripts/install-docker-debian.sh

@@ -11,6 +11,9 @@ END
 #
 #Install Docker on a Debian system, along with other packages required by Labtainers
 #
+type sudo >/dev/null 2>&1 || { echo >&2 "Please install sudo.  Aborting."; exit 1; }
+
+sudo -v || { echo >&2 "Please make sure user is sudoer.  Aborting."; exit 1; }
 
 #needed packages for Docker install
 sudo apt-get update

setup_scripts/install-labtainer.sh

@@ -16,8 +16,8 @@ if [[ result -ne 0 ]];then
 EOT
 fi
 
-ln -s trunk/scripts/labtainer-student
-ln -s trunk/scripts/labtainer-instructor
+if [ ! -h labtainer-student ]; then ln -s trunk/scripts/labtainer-student; fi
+if [ ! -h labtainer-instructor ]; then ln -s trunk/scripts/labtainer-instructor; fi
 cd trunk/setup_scripts
 found_distrib=`cat /etc/*-release | grep "^DISTRIB_ID" | awk -F "=" '{print $2}'`
 if [[ -z "$1" ]]; then
@@ -36,7 +36,7 @@ case "$distrib" in
         ./install-docker-ubuntu.sh
         RESULT=$?
         ;;
-    Debian)
+    Debian|\"Debian*)
         echo is debian
         ./install-docker-debian.sh
         RESULT=$?