martin/docker-qbittorrentvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow all 'boolean' yes/no 0/1 true/false be to set like any equivalent

Browse Source 
It is now possible to set any 'yes/no', '1/0' or 'true/false' value to any of the equivalent definition. This closes #65
This commit is contained in:
DyonR 2021-09-23 14:59:13 +02:00
parent c71b27d75b
commit db18b6860f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvpn/start.sh
View File

@ -34,7 +34,7 @@ fi
echo "[INFO] Not making any changes to iptables version" | ts '%Y-%m-%d %H:%M:%.S' echo "[INFO] Not making any changes to iptables version" | ts '%Y-%m-%d %H:%M:%.S'
fi fi
if [[ $VPN_ENABLED == "yes" ]]; then if [[ $VPN_ENABLED == "1" || $VPN_ENABLED == "true" || $VPN_ENABLED == "yes" ]]; then
# Check if VPN_TYPE is set. # Check if VPN_TYPE is set.
if [[ -z "${VPN_TYPE}" ]]; then if [[ -z "${VPN_TYPE}" ]]; then
echo "[WARNING] VPN_TYPE not set, defaulting to OpenVPN." | ts '%Y-%m-%d %H:%M:%.S' echo "[WARNING] VPN_TYPE not set, defaulting to OpenVPN." | ts '%Y-%m-%d %H:%M:%.S'
@ -231,7 +231,7 @@ if [[ $VPN_ENABLED == "yes" ]]; then
fi fi
fi fi
elif [[ $VPN_ENABLED == "no" ]]; then else
echo "[WARNING] !!IMPORTANT!! You have set the VPN to disabled, your connection will NOT be secure!" | ts '%Y-%m-%d %H:%M:%.S' echo "[WARNING] !!IMPORTANT!! You have set the VPN to disabled, your connection will NOT be secure!" | ts '%Y-%m-%d %H:%M:%.S'
fi fi

7
qbittorrent/start.sh
View File

@ -18,13 +18,14 @@ if [ ! -e /config/qBittorrent/config/qBittorrent.conf ]; then
fi fi
export INSTALL_PYTHON3=$(echo "${INSTALL_PYTHON3,,}") export INSTALL_PYTHON3=$(echo "${INSTALL_PYTHON3,,}")
if [[ $INSTALL_PYTHON3 == "yes" ]]; then if [[ $INSTALL_PYTHON3 == "1" || $INSTALL_PYTHON3 == "true" || $INSTALL_PYTHON3 == "yes" ]]; then
/bin/bash /etc/qbittorrent/install-python3.sh /bin/bash /etc/qbittorrent/install-python3.sh
fi fi
# The mess down here checks if SSL is enabled. # The mess down here checks if SSL is enabled.
export ENABLE_SSL=$(echo "${ENABLE_SSL,,}") export ENABLE_SSL=$(echo "${ENABLE_SSL,,}")
if [[ ${ENABLE_SSL} == 'yes' ]]; then
if [[ ${ENABLE_SSL} == "1" || ${ENABLE_SSL} == "true" || ${ENABLE_SSL} == "yes" ]]; then
echo "[INFO] ENABLE_SSL is set to ${ENABLE_SSL}" | ts '%Y-%m-%d %H:%M:%.S' echo "[INFO] ENABLE_SSL is set to ${ENABLE_SSL}" | ts '%Y-%m-%d %H:%M:%.S'
if [[ ${HOST_OS,,} == 'unraid' ]]; then if [[ ${HOST_OS,,} == 'unraid' ]]; then
echo "[SYSTEM] If you use Unraid, and get something like a 'ERR_EMPTY_RESPONSE' in your browser, add https:// to the front of the IP, and/or do this:" | ts '%Y-%m-%d %H:%M:%.S' echo "[SYSTEM] If you use Unraid, and get something like a 'ERR_EMPTY_RESPONSE' in your browser, add https:// to the front of the IP, and/or do this:" | ts '%Y-%m-%d %H:%M:%.S'
@ -142,7 +143,7 @@ if [ -e /proc/$qbittorrentpid ]; then
echo "[ERROR] Network is down, exiting this Docker" | ts '%Y-%m-%d %H:%M:%.S' echo "[ERROR] Network is down, exiting this Docker" | ts '%Y-%m-%d %H:%M:%.S'
exit 1 exit 1
fi fi
if [ ! "${HEALTH_CHECK_SILENT}" -eq 1 ]; then if [[ ! "${HEALTH_CHECK_SILENT}" == "1" || ! "${HEALTH_CHECK_SILENT}" == "true" || ! "${HEALTH_CHECK_SILENT}" == "yes" ]]; then
echo "[INFO] Network is up" | ts '%Y-%m-%d %H:%M:%.S' echo "[INFO] Network is up" | ts '%Y-%m-%d %H:%M:%.S'
fi fi
sleep ${INTERVAL} sleep ${INTERVAL}