massive overhaul for 18.04

 - rewrite includes flatpak and snap installs
 - even more generic/modular functions
 - fixes and efficiencies
 - deletion of unused app functions

data/favs.list

@@ -1,12 +1,12 @@
-cockpit
 dconf-tools
-gimp
 gnome-disk-utility
+gnome-session
 gnome-software
+gnome-software-plugin-flatpak
+gnome-software-plugin-snap
 gnome-sushi
 gnome-tweak-tool
 gpick
 nautilus
-plank
 sparkleshare
-transmission
+transmission

data/gnome-apps.list

@@ -1,5 +1,6 @@
 bijiben
 epiphany-browser
+fonts-cantarell
 gedit
 gnome-builder
 gnome-calculator
@@ -15,4 +16,5 @@ gnome-screenshot
 gnome-software
 gnome-system-monitor
 gnome-terminal
+gnome-todo
 gnome-weather

data/gnome-shell-extenstions.list

@@ -0,0 +1,5 @@
+gnome-shell-extensions
+gnome-shell-extension-alternate-tab
+gnome-shell-extension-dash-to-dock
+gnome-shell-extension-topicons-plus
+gnome-shell-extension-user-theme

data/purge.list

@@ -1,37 +1,17 @@
 activity-log-manager
 aisleriot
-checkbox-converged
 deja-dup
 gnome-mahjongg
 gnome-mines
 gnome-sudoku
 hplip
-landscape-client-ui-install
-overlay-scrollbar
-overlay-scrollbar-gtk2
-overlay-scrollbar-gtk3
+libreoffice-*
 remmina
 rhythmbox
 shotwell
-shotwell-common
 thunderbird
-ubuntu-system-settings
 ubuntu-web-launchers
-unity-scope-calculator
-unity-scope-chromiumbookmarks
-unity-scope-colourlovers
-unity-scope-devhelp
-unity-scope-firefoxbookmarks
-unity-scope-gdrive
-unity-scope-manpages
-unity-scope-openclipart
-unity-scope-texdoc
-unity-scope-tomboy
-unity-scope-video-remote
-unity-scope-virtualbox
-unity-scope-yelp
-unity-scope-zotero
-unity8*
+unity-*
 usb-creator-gtk
 webbrowser-app
 xdiagnose

functions/add_repositories

@@ -0,0 +1,44 @@
+
+# Add Flatpak Repo
+function add_flatpak_repo() {
+	echo_message header "Starting 'add_flatpak_repo' function"
+	# Check if already added
+	flatpak remotes | grep $1 &> /dev/null
+	# If repo is added
+	if [ $? = 0 ]; then
+		echo_message info "Repository already added."
+		whiptail --msgbox "The $1 repository is already added." 8 56
+	else
+		# Add repository
+		echo_message info "Adding flatpak repository..."
+		flatpak remote-add --if-not-exists $1 $2
+		echo_message success "Repository added."
+		whiptail --title "Finished" --msgbox "The '$1' repository has been added." 8 56
+	fi
+}
+
+# Add Launchpad PPA
+function add_launchpad_ppa() {
+	echo_message header "Starting 'add_launchpad_ppa' function"
+	# Check if PPA already added
+	if ! grep -q "^deb .*${2}" /etc/apt/sources.list /etc/apt/sources.list.d/*; then
+		# draw window
+		if (whiptail \
+			--title "Add PPA Repository" \
+			--yesno "The ${1} PPA repository (${2}) is not present on your system. \n\nWould you like to add it to continue? " 10 64) then
+			# Add repository
+			echo_message info "Adding ${1} PPA repository..."
+			elevate_privilege "add-apt-repository -y ppa:${2}"
+			# Update repository information
+			elevate_privilege "apt update -y"
+			# Done
+			echo_message success "Repository added."
+		else
+			# Cancelled
+			echo_message info "Addition of ${1} repository cancelled."
+			$3
+		fi
+	else 
+		echo_message info "${1} repository already added."
+	fi
+}

functions/apps/chrome

@@ -1,51 +1,17 @@
 #!/bin/bash
 
 # Install Chrome
-function install_chrome { 
+function download_chrome { 
 	# Variables
-	PACKAGE=google-chrome-$@
 	NAME="Google Chrome ($@)"
-	# Check if package is installed
-	check_packages $PACKAGE
-	EXITSTATUS=$?
-	# If package is not installed
-	if [ $EXITSTATUS = 1 ]; then
-		echo_message info $NAME 'is not installed.'
-		echo 'Proceeding'
-		echo_message info 'Downloading '$NAME'...'
-		# Download Debian file that matches system architecture
-		case `uname -i` in
-			i386|i486|i586|i686)
-				curl -O https://dl.google.com/linux/direct/${PACKAGE}_current_i386.deb
-				;;
-			x86_64)
-				curl -O https://dl.google.com/linux/direct/${PACKAGE}_current_amd64.deb
-				;;
-			*)
-				whiptail --title "Error." --msgbox "No remote packages available to download." 8 64
-				;;
-		esac
-		# Install package(s)
-		echo_message info 'Installing '$NAME'...'
-		elevate_privilege "dpkg -i $PACKAGE*.deb"
-		elevate_privilege "apt install -fy"
-		# Cleanup and finish
-		rm $PACKAGE*.deb
-		# Done
-		echo_message success "Installation of '$PACKAGE' complete."
-		whiptail --title "Finished" --msgbox "Installation of $NAME complete." 8 64
-		status=1
-		thirdparty
-	else
-		# Already installed
-		echo_message info $NAME 'already installed.'
-		whiptail --title "Finished" --msgbox "$NAME is already installed." 8 64
-		thirdparty
-	fi
+	PACKAGE=google-chrome-$@_current
+	REMOTE="https://dl.google.com/linux/direct"
+	install_remote_package $NAME $PACKAGE $REMOTE install_thirdparty
+	status=1
 }
 
 # Google Chrome
-function chrome {
+function install_chrome {
 eval `resize` 
 EXITSTATUS=$?
 if [ $EXITSTATUS = 0 ]; then
@@ -64,20 +30,20 @@ if [ $EXITSTATUS = 0 ]; then
 		# Change to lower case and remove spaces.
 		case "${VERSION}" in
 			stable)
-				install_chrome stable;
+				download_chrome stable;
 			;;
 			beta)
-				install_chrome beta;
+				download_chrome beta;
 			;;
 			unstable)
-				install_chrome unstable;
+				download_chrome unstable;
 			;;
 			*) status=1 
-				thirdparty
+				install_thirdparty
 			;;
 		esac
 	done
 else
-	thirdparty
+	install_thirdparty
 fi
 }

functions/apps/dropbox

@@ -1,48 +1,10 @@
 #!/bin/bash
 
 # Dropbox
-function dropbox {
+function install_dropbox {
 	# Variables
 	NAME="Dropbox"
-	PACKAGE=dropbox
-	VERSION=2.10.0
-	# Install
-	echo_message header 'Begin '$NAME' installation'
-	# Check if package is installed
-	check_packages $PACKAGE
-	EXITSTATUS=$?
-	# If package is not installed
-	if [ $EXITSTATUS = 1 ]; then
-		echo_message info $NAME 'is not installed.'
-		echo 'Proceeding'
-		echo_message info 'Downloading '$NAME'...'
-		# Download Debian file that matches system architecture
-		case `uname -i` in
-			i386|i486|i586|i686)
-				curl -O https://linux.dropbox.com/packages/ubuntu/dropbox_${VERSION}_i386.deb
-				;;
-			x86_64)
-				curl -O https://linux.dropbox.com/packages/ubuntu/dropbox_${VERSION}_amd64.deb
-				;;
-			*)
-				whiptail --title "Error." --msgbox "No remote packages available to download." 8 64
-				;;
-		esac
-		# Install package(s)
-		echo_message info 'Installing '$NAME'...'
-		# Admin privileges
-		elevate_privilege "dpkg -i $PACKAGE*.deb"
-		elevate_privilege "apt install -fy"
-		# Cleanup and finish
-		rm $PACKAGE*.deb
-		# Done
-		echo_message success "Installation of '$PACKAGE' complete."
-		whiptail --title "Finished" --msgbox "Installation of $NAME complete." 8 64
-		thirdparty
-	else
-		# Already installed
-		echo_message info $NAME 'already installed.'
-		whiptail --title "Finished" --msgbox "$NAME is already installed." 8 64
-		thirdparty
-	fi
+	PACKAGE="dropbox_2.10.0"
+	REMOTE="https://linux.dropbox.com/packages/ubuntu"
+	install_remote_package $NAME $PACKAGE $REMOTE install_thirdparty
 }