Skip to content

Commit 5ff5532

Browse files
committed
Feature: (--with-debs) make hestia-nginx and hestia-php local packages optional, only hestia deb is required
1 parent be4bd79 commit 5ff5532

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

install/hst-install-debian.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,8 +866,18 @@ check_result $? "apt-get install failed"
866866
# Install Hestia packages from local folder
867867
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
868868
dpkg -i $withdebs/hestia_*.deb
869-
dpkg -i $withdebs/hestia-php_*.deb
870-
dpkg -i $withdebs/hestia-nginx_*.deb
869+
870+
if [ -z $(ls "$withdebs/hestia-php_*.deb" 2>/dev/null) ]; then
871+
apt-get -y install hestia-php > /dev/null 2>&1
872+
else
873+
dpkg -i $withdebs/hestia-php_*.deb
874+
fi
875+
876+
if [ -z $(ls "$withdebs/hestia-nginx_*.deb" 2>/dev/null) ]; then
877+
apt-get -y install hestia-nginx > /dev/null 2>&1
878+
else
879+
dpkg -i $withdebs/hestia-nginx_*.deb
880+
fi
871881
fi
872882

873883
# Restoring autostart policy

install/hst-install-ubuntu.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,8 +840,18 @@ check_result $? "apt-get install failed"
840840
# Install Hestia packages from local folder
841841
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
842842
dpkg -i $withdebs/hestia_*.deb
843-
dpkg -i $withdebs/hestia-php_*.deb
844-
dpkg -i $withdebs/hestia-nginx_*.deb
843+
844+
if [ -z $(ls "$withdebs/hestia-php_*.deb" 2>/dev/null) ]; then
845+
apt-get -y install hestia-php > /dev/null 2>&1
846+
else
847+
dpkg -i $withdebs/hestia-php_*.deb
848+
fi
849+
850+
if [ -z $(ls "$withdebs/hestia-nginx_*.deb" 2>/dev/null) ]; then
851+
apt-get -y install hestia-nginx > /dev/null 2>&1
852+
else
853+
dpkg -i $withdebs/hestia-nginx_*.deb
854+
fi
845855
fi
846856

847857
# Restoring autostart policy

0 commit comments

Comments
 (0)