From ae012977ab951d8f3e1ff523cafa744256c390f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <theodorstormgrade@gmail.com>
Date: Fri, 2 Mar 2018 09:59:50 +0100
Subject: [PATCH] remove sudo and added root check

Removed sudo because it made no sense running the script not as root
when nearly all of the commands where run as root.
---
 ubuntu/18.04/install.sh | 53 ++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/ubuntu/18.04/install.sh b/ubuntu/18.04/install.sh
index 639dce2..3a61f08 100644
--- a/ubuntu/18.04/install.sh
+++ b/ubuntu/18.04/install.sh
@@ -11,15 +11,20 @@
 # Update our machine to the latest code if we need to.
 #
 
+if [ ! $(id -u) ] ; then
+    echo 'This script must be run with root privileges' >&2
+    exit 1
+fi
 
 # Check if we have the bionic-proposed sources list
-sudo cat /etc/apt/sources.list | grep bionic-proposed > /dev/null
+
+cat /etc/apt/sources.list | grep bionic-proposed > /dev/null
 if [ "$?" == "1" ]; then
-sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe" >> /etc/apt/sources.list <<EOF
+bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe" >> /etc/apt/sources.list <<EOF
 EOF'
 fi
 
-sudo apt update && sudo apt dist-upgrade -y
+apt update && apt dist-upgrade -y
 
 if [ -f /var/run/reboot-required ]; then
     echo "A reboot is required in order to proceed with the install." >&2
@@ -32,48 +37,48 @@ fi
 #
 
 # Install the xrdp service so we have the auto start behavior
-sudo apt install -y xrdp
+apt install -y xrdp
 
-sudo systemctl stop xrdp
-sudo systemctl stop xrdp-sesman
+systemctl stop xrdp
+systemctl stop xrdp-sesman
 
 # Configure the installed XRDP ini files.
 # use vsock transport.
-sudo sed -i_orig -e 's/use_vsock=false/use_vsock=true/g' /etc/xrdp/xrdp.ini
+sed -i_orig -e 's/use_vsock=false/use_vsock=true/g' /etc/xrdp/xrdp.ini
 # use rdp security.
-sudo sed -i_orig -e 's/security_layer=negotiate/security_layer=rdp/g' /etc/xrdp/xrdp.ini
+sed -i_orig -e 's/security_layer=negotiate/security_layer=rdp/g' /etc/xrdp/xrdp.ini
 # remove encryption validation.
-sudo sed -i_orig -e 's/crypt_level=high/crypt_level=none/g' /etc/xrdp/xrdp.ini
+sed -i_orig -e 's/crypt_level=high/crypt_level=none/g' /etc/xrdp/xrdp.ini
 # disable bitmap compression since its local its much faster
-sudo sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' /etc/xrdp/xrdp.ini
+sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' /etc/xrdp/xrdp.ini
 
 # use the default lightdm x display
-# sudo sed -i_orig -e 's/X11DisplayOffset=10/X11DisplayOffset=0/g' /etc/xrdp/sesman.ini
+#  sed -i_orig -e 's/X11DisplayOffset=10/X11DisplayOffset=0/g' /etc/xrdp/sesman.ini
 
 # Changed the allowed_users
-sudo sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config
+sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config
 
 # Enable the hv_sock module
-sudo rmmod vmw_vsock_vmci_transport
-sudo rmmod vsock
-sudo modprobe hv_sock
+rmmod vmw_vsock_vmci_transport
+rmmod vsock
+modprobe hv_sock
 
 # Blacklist the vmw module
-sudo cat /etc/modprobe.d/blacklist.conf | grep vmw_vsock_vmci_transport > /dev/null
+cat /etc/modprobe.d/blacklist.conf | grep vmw_vsock_vmci_transport > /dev/null
 if [ "$?" == "1" ]; then
-sudo bash -c 'echo "blacklist vmw_vsock_vmci_transport" >> /etc/modprobe.d/blacklist.conf <<EOF
+ bash -c 'echo "blacklist vmw_vsock_vmci_transport" >> /etc/modprobe.d/blacklist.conf <<EOF
 EOF'
 fi
 
 #Ensure hv_sock gets loaded
-sudo cat /etc/modules | grep hv_sock > /dev/null
+ cat /etc/modules | grep hv_sock > /dev/null
 if [ "$?" == "1" ]; then
-sudo bash -c 'echo "hv_sock" >> /etc/modules <<EOF
+ bash -c 'echo "hv_sock" >> /etc/modules <<EOF
 EOF'
 fi
 
 # Configure the policy xrdp session
-sudo bash -c 'cat >/etc/polkit-1/localauthority.conf.d/02-allow-colord.conf <<EOF
+ bash -c 'cat >/etc/polkit-1/localauthority.conf.d/02-allow-colord.conf <<EOF
 
 polkit.addRule(function(action, subject) {
     if ((action.id == "org.freedesktop.color-manager.create-device" ||
@@ -90,17 +95,15 @@ polkit.addRule(function(action, subject) {
 EOF'
 
 # reconfigure the service
-sudo systemctl daemon-reload
-sudo systemctl start xrdp
+systemctl daemon-reload
+systemctl start xrdp
 
 #
 # End XRDP
 ###############################################################################
 
 # Install Gmone Tweak
-sudo apt-get install gnome-tweak-tool -y
+apt-get install gnome-tweak-tool -y
 
-echo
 echo "Install is complete."
 echo "Reboot your machine to begin using XRDP."
-echo