From 47aef03195163a88c71d6637adfffe460dcc54fe Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 9 Jan 2024 10:59:43 +0100 Subject: [PATCH] Update 93-openvpn.sh --- .../rootfs/etc/cont-init.d/93-openvpn.sh | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh index 82d89f6d3..fdeec26c6 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh @@ -28,21 +28,20 @@ if bashio::config.true 'openvpn_enabled'; then bashio::warning "$file not found" return 1 fi - - # Avoid single auth-user-pass - if grep -q "^auth-user-pass" "$file" ; then - second_word="$(sed -n "/^auth-user-pass/p" "$file" | awk -F' ' '{print $2}')" - # If the second word is empty or starts with a dash - if [ -z "$second_word" ] || [[ "$second_word" == -* ]]; then - # Comment out the line with # - sed -i '/^auth-user-pass/s/^/#/' "$file" - fi - fi - - # Check referenced files + + # Check each lines cp "$file" /tmpfile - while read -r line - do + line_number=0 + while read -r line; do + # Increment the line number + ((line_number++)) + # Extract the second argument + file_name="$(echo "$line" | awk -F' ' '{print $2}')" + if [ -z "$file_name" ] || [[ "$file_name" == -* ]]; then + # Comment out the line + sed -i "${line_number}s/^/# /" "$file" + fi + # Check if the line contains a txt file if [[ ! $line =~ ^"#" ]] && [[ ! $line =~ ^";" ]] && [[ "$line" =~ \.txt ]] || [[ "$line" =~ \.crt ]] || [[ "$line" =~ auth-user-pass ]]; then # Extract the txt file name from the line