call dos2unix script

pull/27/head 4.1.7-1-04
binhex 5 years ago
parent d01fc424df
commit 10f79aac2f

@ -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' 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 # convert CRLF (windows) to LF (unix) for ovpn
/usr/bin/dos2unix "${VPN_CONFIG}" /usr/local/bin/dos2unix.sh "${VPN_CONFIG}"
# get first matching 'remote' line in ovpn # get first matching 'remote' line in ovpn
vpn_remote_line=$(cat "${VPN_CONFIG}" | grep -P -o -m 1 '^(\s+)?remote\s.*') 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 rm -f /config/qBittorrent/data/BT_backup/session.lock
# force unix line endings conversion in case user edited qbittorrent.conf with notepad # force unix line endings conversion in case user edited qbittorrent.conf with notepad
/usr/bin/dos2unix "${qbittorrent_config}" /usr/local/bin/dos2unix.sh "${qbittorrent_config}"
# set locale to prevent 4.1.4 gui render issues if no locale set # 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}" grep -q 'General\\Locale' "${qbittorrent_config}" || sed -i '/\[Preferences\]/a General\\Locale=en' "${qbittorrent_config}"

Loading…
Cancel
Save