From 471c297f9d06899ffbe2cb9014fc8ef2508e4507 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 28 Jun 2019 20:29:11 -0700
Subject: [PATCH] More small tweaks and fixes.

---
 docker/debian-10/Dockerfile    | 2 +-
 docker/debian-9/Dockerfile     | 2 +-
 docker/scripts/do-build.sh     | 2 +-
 docker/scripts/hello.sh        | 5 +++++
 docker/ubuntu-14.04/Dockerfile | 4 ++--
 docker/ubuntu-16.04/Dockerfile | 4 ++--
 docker/ubuntu-18.04/Dockerfile | 4 ++--
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docker/debian-10/Dockerfile b/docker/debian-10/Dockerfile
index 3e5fe74a..77700048 100644
--- a/docker/debian-10/Dockerfile
+++ b/docker/debian-10/Dockerfile
@@ -21,7 +21,7 @@ RUN \
 # Set up a user, and etc.
         mkdir -p /dist; \
         adduser --disabled-password --gecos "" ${USER}; \
-        echo "${USER} ALL=(ALL) NOPASSWD:ALL\n" >> /etc/sudoers; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
 # Install development packages needed for building wxPython
         apt-get install -y \
                 freeglut3 \
diff --git a/docker/debian-9/Dockerfile b/docker/debian-9/Dockerfile
index 67b49117..b3b575c9 100644
--- a/docker/debian-9/Dockerfile
+++ b/docker/debian-9/Dockerfile
@@ -21,7 +21,7 @@ RUN \
 # Set up a user, and etc.
         mkdir -p /dist; \
         adduser --disabled-password --gecos "" ${USER}; \
-        echo "${USER} ALL=(ALL) NOPASSWD:ALL\n" >> /etc/sudoers; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
 # Install development packages needed for building wxPython
         apt-get install -y \
                 freeglut3 \
diff --git a/docker/scripts/do-build.sh b/docker/scripts/do-build.sh
index 72c013ee..1a286b29 100755
--- a/docker/scripts/do-build.sh
+++ b/docker/scripts/do-build.sh
@@ -32,7 +32,7 @@ if [ "$TARBALL" == "" ]; then
     exit 1
 fi
 
-if [ $PYENV != all -a ! -d ~/venv/$PYENV ]; then 
+if [ $PYENV != all -a ! -d ~/venvs/$PYENV ]; then 
     echo "ERROR: The $PYENV environment not found in the $DIST_NAME image."
     exit 1
 fi
diff --git a/docker/scripts/hello.sh b/docker/scripts/hello.sh
index 3060b2fa..8330c7ab 100755
--- a/docker/scripts/hello.sh
+++ b/docker/scripts/hello.sh
@@ -9,3 +9,8 @@ echo ""
 if [ -x /usr/bin/lsb_release ]; then
         /usr/bin/lsb_release -a
 fi
+if [ -e /etc/redhat-release ]; then
+        cat /etc/redhat-release
+fi
+
+echo ""
diff --git a/docker/ubuntu-14.04/Dockerfile b/docker/ubuntu-14.04/Dockerfile
index 40ecb919..2556a26a 100644
--- a/docker/ubuntu-14.04/Dockerfile
+++ b/docker/ubuntu-14.04/Dockerfile
@@ -1,4 +1,4 @@
-# The base image (v14.04 = "trusty")
+# The base image (v14.04 == "trusty")
 FROM ubuntu:14.04
 
 # Set environment variables
@@ -14,7 +14,7 @@ ENV GTK2_OK=yes
 RUN \
         mkdir -p /dist; \
         adduser --disabled-password --gecos "" ${USER}; \
-        echo "${USER} ALL=(ALL) NOPASSWD:ALL\n" >> /etc/sudoers; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
         apt-get update; \
         apt-get upgrade -y; \
         apt-get install -y \
diff --git a/docker/ubuntu-16.04/Dockerfile b/docker/ubuntu-16.04/Dockerfile
index 0c263b5f..3b7c7224 100644
--- a/docker/ubuntu-16.04/Dockerfile
+++ b/docker/ubuntu-16.04/Dockerfile
@@ -1,4 +1,4 @@
-# The base image (v16.04 = "xenial")
+# The base image (v16.04 == "xenial")
 FROM ubuntu:16.04
 
 # Set environment variables
@@ -14,7 +14,7 @@ ENV GTK2_OK=yes
 RUN \
         mkdir -p /dist; \
         adduser --disabled-password --gecos "" ${USER}; \
-        echo "${USER} ALL=(ALL) NOPASSWD:ALL\n" >> /etc/sudoers; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
         apt-get update; \
         apt-get upgrade -y; \
         apt-get install -y \
diff --git a/docker/ubuntu-18.04/Dockerfile b/docker/ubuntu-18.04/Dockerfile
index 54fcc6a7..15fe8dcc 100644
--- a/docker/ubuntu-18.04/Dockerfile
+++ b/docker/ubuntu-18.04/Dockerfile
@@ -1,4 +1,4 @@
-# The base image  (v18.04 = "bionic")
+# The base image  (v18.04 == "bionic")
 FROM ubuntu:18.04
 
 # Set environment variables
@@ -14,7 +14,7 @@ ENV GTK2_OK=yes
 RUN \
         mkdir -p /dist; \
         adduser --disabled-password --gecos "" ${USER}; \
-        echo "${USER} ALL=(ALL) NOPASSWD:ALL\n" >> /etc/sudoers; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
         apt-get update; \
         apt-get upgrade -y; \
         apt-get install -y \