From bc4aee28517e84fcc59ea69c7737be2697a96e03 Mon Sep 17 00:00:00 2001
From: Alec Muffett <alec.muffett@gmail.com>
Date: Thu, 4 Jul 2019 09:04:02 +0000
Subject: [PATCH] commit: revisions to Ubuntu18LTS installer

---
 opt.d/install-everything-on-ubuntu-18.04.sh | 49 +++++++++++++--------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/opt.d/install-everything-on-ubuntu-18.04.sh b/opt.d/install-everything-on-ubuntu-18.04.sh
index a8b2023..9f4030b 100755
--- a/opt.d/install-everything-on-ubuntu-18.04.sh
+++ b/opt.d/install-everything-on-ubuntu-18.04.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-apt install apt-transport-https
+PACKAGES="
+deb.torproject.org-keyring
+nginx-extras
+python-dev
+python-pip
+socat
+tor
+"
 
 cat <<EOF | sudo dd of=/etc/apt/sources.list.d/tor.list
 deb https://deb.torproject.org/torproject.org bionic main
@@ -11,31 +18,35 @@ TORSIG=A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
 gpg --keyserver keys.gnupg.net --recv $TORSIG || exit 1
 gpg --export $TORSIG | sudo apt-key add - || exit 1
 
+# install everything in one go
+echo ""
+echo "$0: if you are already running a webserver, nginx may complain about port80"
+echo "$0: if such happens, do not worry, because we will soon disable nginx..."
+sudo apt install -y apt-transport-https || exit 1
 sudo apt update || exit 1
-sudo apt install tor deb.torproject.org-keyring socat python-dev python-pip || exit 1
-sudo systemctl stop tor # is there a way to install-without-enable?
-sudo systemctl disable tor # we don't need the system to run it
+sudo apt upgrade -y || exit 1
+sudo apt install -y $PACKAGES || exit 1
+sudo systemctl stop tor nginx || exit 1
+sudo systemctl disable tor nginx || exit 1
 
+# install python stuff
 echo ""
-echo $0: if you are already running a webserver then nginx will complain about port80, do not worry
-sudo apt install nginx-extras
-sudo systemctl stop nginx # is there a way to install-without-enable?
-sudo systemctl disable nginx # we don't need the system to run it
-
-# files and directories
-sudo find /var/log/nginx/ -perm -0200 -print0 | sudo xargs -0 chmod g+w || exit 1
-
-echo ""
-echo $0: this will probably complain about pip versions, do not worry about it.
+echo $0: this command may complain about pip versions, do not worry about it.
 sudo pip install onionbalance || exit 1
+
+# fix files and directories
+sudo find /var/log/nginx/ -perm -0200 -print0 | sudo xargs -0 chmod g+w || exit 1
 sudo find /usr/local/bin /usr/local/lib -perm -0400 -print0 | sudo xargs -0 chmod a+r || exit 1
 sudo find /usr/local/bin /usr/local/lib -perm -0100 -print0 | sudo xargs -0 chmod a+x || exit 1
 
 echo ""
-echo IMPORTANT: some versions of Ubuntu packages are unfortunately old.
-echo Because of this, when starting projects you may see messages like:
-echo ">" could not open error log file: open /var/log/nginx/error.log failed
-echo ...and these specific messages may be safely ignored.
-echo done.
+echo "$0: NOTE: Some versions of Ubuntu packages are old; because of this,"
+echo "$0: when starting projects you may see messages like:"
+echo ""
+echo "$0: > could not open error log file: open /var/log/nginx/error.log failed"
+echo ""
+echo "$0: ...when using EOTK; these specific messages may be safely ignored."
+echo ""
+echo "$0: done"
 
 exit 0