Refactor IS_CHROOT
This commit is contained in:
@@ -113,6 +113,11 @@ if [[ "$1" == "--install-only" ]]; then
|
||||
START=false
|
||||
fi
|
||||
|
||||
IS_CHROOT=false
|
||||
if [[ -x "$(command -v ischroot)" ]] && ischroot; then
|
||||
IS_CHROOT=true
|
||||
fi
|
||||
|
||||
if [[ -z "$BTCPAYGEN_CRYPTO1" ]]; then
|
||||
if [[ "$OSTYPE" != "darwin"* ]]; then
|
||||
# Not Mac OS - Mac OS uses it's own env file
|
||||
@@ -334,7 +339,7 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ]
|
||||
# zlib1g:armhf is needed for docker-compose, but we install it here as we changed dpkg here
|
||||
apt-get install -y docker-ce:armhf zlib1g:armhf
|
||||
fi
|
||||
if [[ -x "$(command -v ischroot)" ]] && ischroot; then
|
||||
if $IS_CHROOT; then
|
||||
echo "chroot detected, running dockerd in background..."
|
||||
dockerd &
|
||||
echo "Waiting /var/run/docker.sock to be created..."
|
||||
@@ -417,12 +422,12 @@ WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
|
||||
echo -e "BTCPay Server systemd configured in /etc/systemd/system/btcpayserver.service\n"
|
||||
systemctl daemon-reload
|
||||
systemctl enable btcpayserver
|
||||
if $START; then
|
||||
if $START && ! $IS_CHROOT; then
|
||||
echo "BTCPay Server starting... this can take 5 to 10 minutes..."
|
||||
systemctl start btcpayserver
|
||||
echo "BTCPay Server started"
|
||||
fi
|
||||
|
||||
$START && $IS_CHROOT && echo "Impossible to start a systemctl service in chroot... skipping"
|
||||
elif [[ -x "$(command -v initctl)" ]]; then
|
||||
# Use upstart
|
||||
echo "Using upstart"
|
||||
@@ -473,7 +478,7 @@ fi
|
||||
cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
|
||||
install_tooling
|
||||
|
||||
if ! $START && [[ -x "$(command -v ischroot)" ]] && ischroot; then
|
||||
if ! $START && $IS_CHROOT; then
|
||||
echo "Killing dockerd in the background..."
|
||||
kill %-
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user