Fixing rerun without overwrite

ubuntu/18.04/install.sh

@@ -11,16 +11,14 @@
 # Update our machine to the latest code if we need to.
 #
 
-sudo apt update
+# Check if we have the bionic-proposed sources list
-sudo apt upgrade -y
+sudo 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
+EOF'
+fi
 
-# Get git if we dont have it.
+sudo apt update && sudo apt dist-upgrade -y
-sudo apt install -y git
-
-# TODO: Remove the custom kernel logic when 18.04 supports hv_sock by default.
-sudo add-apt-repository ppa:billy-olsen/test-kernels-bionic
-sudo apt-get update
-sudo apt install linux-image-4.14.0-17-generic
 
 if [ -f /var/run/reboot-required ]; then
     echo
@@ -34,33 +32,13 @@ fi
 ###############################################################################
 # XRDP
 #
-export XRDP_PATH=~/git/src/github.com/neutrinolabs/xrdp
 
 # Install the xrdp service so we have the auto start behavior
 sudo apt install -y xrdp
 
-# Get XRDP requirements
-# ./bootstrap requirements 'autoconf libtool pkg-config'
-# ./configure requirements 'libssl-dev libpam0g-dev libjpeg-dev libfuse-dev libx11-dev libxfixes-dev libxrandr-dev nasm'
-sudo apt install -y autoconf libtool pkg-config libssl-dev libpam0g-dev libjpeg-dev libfuse-dev libx11-dev libxfixes-dev libxrandr-dev nasm
-
-# Get XRDP
-if [ ! -d $XRDP_PATH ]; then
-    git clone https://github.com/neutrinolabs/xrdp $XRDP_PATH
-fi
-
-# Configure XRDP
-cd $XRDP_PATH
-./bootstrap
-./configure --enable-vsock --enable-jpeg --enable-fuse
-
 sudo systemctl stop xrdp
 sudo systemctl stop xrdp-sesman
 
-# Build/Install XRDP
-make
-sudo make install
-
 # 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
@@ -76,19 +54,26 @@ sudo sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' /etc/
 
 # Changed the allowed_users
 sudo sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config
+sudo dpkg-reconfigure xserver-xorg-legacy
 
 # Enable the hv_sock module
-sudo rmmod vmw_vsock_vmci_transport
+# sudo rmmod vmw_vsock_vmci_transport
-sudo rmmod vsock
+# sudo rmmod vsock
-sudo modprobe hv_sock
+# sudo modprobe hv_sock
 
 # Blacklist the vmw module
+sudo 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
 EOF'
+fi
 
 #Ensure hv_sock gets loaded
+sudo cat /etc/modules | grep hv_sock > /dev/null
+if [ "$?" == "1" ]; then
 sudo 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
@@ -115,7 +100,7 @@ sudo systemctl start xrdp
 # End XRDP
 ###############################################################################
 
-# Install Gmone Tweak
+# Install Gnome Tweak
 sudo apt-get install gnome-tweak-tool -y
 
 echo