gnupg2 check fixes

CHANGELOG.md

@@ -37,7 +37,7 @@ All notable changes to this project will be documented in this file.
 - Fixed cronjob issue with sftp jail due to missing user.
 - Fixed issue #569 Remote backup hostname would reject ip addr without reverse dns (PTR record).
 - Create a couple of writeable folders in each user home directory (#580).
-- Added gnupg2 check to prevent issues with pubkey installation.
+- Added gnupg/gnupg2 check to prevent issues with pubkey installation.
 - Fixed nameserver validation on add new user packages.
 
 ## [1.0.5] - 2019-08-06 - Hotfix

install/hst-install-debian.sh

@@ -343,8 +343,8 @@ if [ ! -e '/usr/lib/apt/methods/https' ]; then
     check_result $? "Can't install apt-transport-https"
 fi
 
-# Check if gnupg2 is installed
-if [ ! -e '/usr/bin/gnupg2' ]; then
+# Check if gnupg or gnupg2 is installed
+if [ ! -e '/usr/lib/gnupg2' ] || [ ! -e '/usr/lib/gnupg' ]; then
     echo "(*) Installing gnupg2..."
     apt-get -y install gnupg2 >> $LOG
     check_result $? "Can't install gnupg2"

install/hst-install-ubuntu.sh

@@ -317,8 +317,8 @@ if [ ! -e '/usr/bin/apt-add-repository' ]; then
     check_result $? "Can't install software-properties-common"
 fi
 
-# Check if gnupg2 is installed
-if [ ! -e '/usr/bin/gnupg2' ]; then
+# Check if gnupg or gnupg2 is installed
+if [ ! -e '/usr/lib/gnupg2' ] || [ ! -e '/usr/lib/gnupg' ]; then
     echo "(*) Installing gnupg2..."
     apt-get -y install gnupg2 >> $LOG
     check_result $? "Can't install gnupg2"