avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-20 14:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid wrong config name in errors

Browse Source 
https://github.com/alexbelgium/hassio-addons/issues/1175
This commit is contained in:
Alexandre
2024-01-12 17:14:56 +01:00
committed by GitHub
parent 23d1933154
commit f6e2319263
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
View File

@@ -107,9 +107,6 @@ if bashio::config.true 'openvpn_enabled'; then
# If correct type # If correct type
if [[ "$openvpn_config" == *".ovpn" ]] || [[ "$openvpn_config" == *".conf" ]]; then if [[ "$openvpn_config" == *".ovpn" ]] || [[ "$openvpn_config" == *".conf" ]]; then
echo "... configured ovpn file : using /addon_configs/$HOSTNAME/openvpn/$openvpn_config" echo "... configured ovpn file : using /addon_configs/$HOSTNAME/openvpn/$openvpn_config"
# Check path
check_path /config/openvpn/"$openvpn_config"
# Not correct type
else else
bashio::exit.nok "Configured ovpn file : $openvpn_config is set but does not end by .ovpn ; it can't be used!" bashio::exit.nok "Configured ovpn file : $openvpn_config is set but does not end by .ovpn ; it can't be used!"
fi fi
@@ -128,8 +125,6 @@ if bashio::config.true 'openvpn_enabled'; then
openvpn_config="${VPN_CONFIG##*/}" openvpn_config="${VPN_CONFIG##*/}"
echo "... Openvpn enabled, but openvpn_config option empty. Selecting a random ovpn file : ${openvpn_config}. Other available files :" echo "... Openvpn enabled, but openvpn_config option empty. Selecting a random ovpn file : ${openvpn_config}. Other available files :"
printf '%s\n' "${VPN_CONFIGS[@]}" printf '%s\n' "${VPN_CONFIGS[@]}"
# Check path
check_path /config/openvpn/"${openvpn_config}"
# If openvpn_enabled set, config not set, and openvpn folder empty # If openvpn_enabled set, config not set, and openvpn folder empty
else else
bashio::exit.nok "openvpn_enabled is set, however, your openvpn folder is empty ! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?" bashio::exit.nok "openvpn_enabled is set, however, your openvpn folder is empty ! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
@@ -137,6 +132,9 @@ if bashio::config.true 'openvpn_enabled'; then
# Send to openvpn script # Send to openvpn script
sed -i "s|/config/openvpn/config.ovpn|/config/openvpn/$openvpn_config|g" /etc/s6-overlay/s6-rc.d/svc-qbittorrent/run sed -i "s|/config/openvpn/config.ovpn|/config/openvpn/$openvpn_config|g" /etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
# Check path
check_path /config/openvpn/"${openvpn_config}"
# Set credentials # Set credentials
if bashio::config.has_value "openvpn_username"; then if bashio::config.has_value "openvpn_username"; then