revert back to direct call to dos2unix

pull/22/head
binhex 5 years ago
parent 3b09af0e43
commit 006c98dc3b

@ -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
/root/dos2unix-wrapper.sh "${VPN_CONFIG}"
/usr/bin/dos2unix "${VPN_CONFIG}"
# get first matching 'remote' line in ovpn
vpn_remote_line=$(cat "${VPN_CONFIG}" | grep -P -o -m 1 '^(\s+)?remote\s.*')

@ -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
/root/dos2unix-wrapper.sh "${qbittorrent_config}"
/usr/bin/dos2unix "${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}"

Loading…
Cancel
Save