From 3b09af0e4320d70475e1c21d7392a99cf9f9c9db Mon Sep 17 00:00:00 2001 From: binhex Date: Fri, 7 Jun 2019 12:48:10 +0100 Subject: [PATCH] check if convert req using wrapper --- build/root/install.sh | 2 +- run/nobody/watchdog.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/root/install.sh b/build/root/install.sh index 2f211cb..a6832ec 100644 --- a/build/root/install.sh +++ b/build/root/install.sh @@ -164,7 +164,7 @@ if [[ $VPN_ENABLED == "yes" ]]; then echo "[info] OpenVPN config file (ovpn extension) is located at ${VPN_CONFIG}" | ts '%Y-%m-%d %H:%M:%.S' # convert CRLF (windows) to LF (unix) for ovpn - /usr/bin/dos2unix "${VPN_CONFIG}" 1> /dev/null + /root/dos2unix-wrapper.sh "${VPN_CONFIG}" # get first matching 'remote' line in ovpn vpn_remote_line=$(cat "${VPN_CONFIG}" | grep -P -o -m 1 '^(\s+)?remote\s.*') diff --git a/run/nobody/watchdog.sh b/run/nobody/watchdog.sh index 9e3f778..8d29ae7 100644 --- a/run/nobody/watchdog.sh +++ b/run/nobody/watchdog.sh @@ -21,7 +21,7 @@ echo "[info] Removing session lock file (if it exists)..." rm -f /config/qBittorrent/data/BT_backup/session.lock # force unix line endings conversion in case user edited qbittorrent.conf with notepad -dos2unix "${qbittorrent_config}" +/root/dos2unix-wrapper.sh "${qbittorrent_config}" # set locale to prevent 4.1.4 gui render issues if no locale set grep -q 'General\\Locale' "${qbittorrent_config}" || sed -i '/\[Preferences\]/a General\\Locale=en' "${qbittorrent_config}"