From 354a977b7b758eea65e64b9bec55ad69b2102ddc Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Mon, 16 Mar 2020 08:44:42 +0200
Subject: [PATCH] add debian 10 support

---
 README.md                |  6 +++---
 tests/Debian/Vagrantfile |  2 +-
 xo-install.sh            | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5ec0a85..08f5727 100644
--- a/README.md
+++ b/README.md
@@ -59,14 +59,13 @@ notes:
 Tool has been tested to work with following distros:
 
 - CentOS 7 (note LVM file level restore issue from below)
-- Debian 9
+- Debian 10
 - Ubuntu 18.04
 
 Installation works but not tested frequently:
 - Debian 8
+- Debian 9
 - Ubuntu 16.04
-- Debian 10 (experimental branch)
-- Ubuntu 19 (experimental branch)
 
 In order to use file level restore from delta backups, the service needs to be ran as root.
 CentOS installation is currently not able to do file level restore if the backed up disk contains LVM.
@@ -115,4 +114,5 @@ Debian/Ubuntu:
 - lvm2
 - nfs-common
 - cifs-utils
+- gnupg (debian 10)
 ```
diff --git a/tests/Debian/Vagrantfile b/tests/Debian/Vagrantfile
index e9fbfb0..54651e2 100644
--- a/tests/Debian/Vagrantfile
+++ b/tests/Debian/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "debian/stretch64"
+  config.vm.box = "debian/buster64"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
diff --git a/xo-install.sh b/xo-install.sh
index f809c4a..1373356 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -149,6 +149,13 @@ function InstallDependenciesDebian {
 	apt-get install -y apt-transport-https ca-certificates >/dev/null
 	echo -e "\r${OK} Installing apt-transport-https and ca-certificates packages to support https repos"
 
+	if [[ $OSVERSION == "10" ]]; then
+		echo
+		echo -ne "${PROGRESS} Debian 10, so installing gnupg also"
+		apt-get install gnupg -y >/dev/null
+		echo -e "\r${OK} Debian 10, so installing gnupg also"
+	fi
+
 	# install curl for later tasks if missing
 	if [[ -z $(which curl) ]]; then
 		echo
@@ -604,8 +611,8 @@ function CheckOS {
 	elif [[ -f /etc/os-release ]]; then
 		OSVERSION=$(grep ^VERSION_ID /etc/os-release | cut -d'=' -f2 | grep -Eo "[0-9]{1,2}" | head -1)
 		OSNAME=$(grep ^NAME /etc/os-release | cut -d'=' -f2 | sed 's/"//g' | awk '{print $1}')
-		if [[ $OSNAME == "Debian" ]] && [[ ! $OSVERSION =~ ^(8|9)$ ]]; then
-			echo -e "${FAIL} Only Debian 8/9 supported"
+		if [[ $OSNAME == "Debian" ]] && [[ ! $OSVERSION =~ ^(8|9|10)$ ]]; then
+			echo -e "${FAIL} Only Debian 8/9/10 supported"
 			exit 0
 		elif [[ $OSNAME == "Ubuntu" ]] && [[ ! $OSVERSION =~ ^(16|18)$ ]]; then
 			echo -e "${FAIL} Only Ubuntu 16/18 supported"