Skip to content

Commit 5ea86c0

Browse files
committed
Added gnupg2 check to prevent issues with pubkey installation.
1 parent 4c75d49 commit 5ea86c0

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file.
3737
- Fixed cronjob issue with sftp jail due to missing user.
3838
- Fixed issue #569 Remote backup hostname would reject ip addr without reverse dns (PTR record).
3939
- Create a couple of writeable folders in each user home directory (#580).
40+
- Added gnupg2 check to prevent issues with pubkey installation.
4041

4142
## [1.0.5] - 2019-08-06 - Hotfix
4243
### Bugfixes

install/hst-install-debian.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,13 @@ if [ ! -e '/usr/lib/apt/methods/https' ]; then
343343
check_result $? "Can't install apt-transport-https"
344344
fi
345345

346+
# Check if gnupg2 is installed
347+
if [ ! -e '/usr/bin/gnupg2' ]; then
348+
echo "(*) Installing gnupg2..."
349+
apt-get -y install gnupg2 >> $LOG
350+
check_result $? "Can't install gnupg2"
351+
fi
352+
346353
# Check if apparmor is installed
347354
if [ $(dpkg-query -W -f='${Status}' apparmor 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
348355
apparmor='no'

install/hst-install-ubuntu.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,13 @@ if [ ! -e '/usr/bin/apt-add-repository' ]; then
317317
check_result $? "Can't install software-properties-common"
318318
fi
319319

320+
# Check if gnupg2 is installed
321+
if [ ! -e '/usr/bin/gnupg2' ]; then
322+
echo "(*) Installing gnupg2..."
323+
apt-get -y install gnupg2 >> $LOG
324+
check_result $? "Can't install gnupg2"
325+
fi
326+
320327
# Check repository availability
321328
wget --quiet "https://$GPG/deb_signing.key" -O /dev/null
322329
check_result $? "Unable to connect to the Hestia APT repository"

0 commit comments

Comments
 (0)