diff --git a/Dockerfile b/Dockerfile index 50449b1a05..040fa0a407 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ VOLUME /config RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/v3.13/community" >> /etc/apk/repositories \ && apk --no-cache add bash dumb-init ip6tables ufw@community openvpn shadow transmission-daemon transmission-cli \ - curl jq tzdata openrc tinyproxy tinyproxy-openrc openssh unrar git util-linux \ + curl jq tzdata openrc tinyproxy tinyproxy-openrc openssh unrar git \ && mkdir -p /opt/transmission-ui \ && echo "Install Flood for Transmission" \ && wget -qO- https://github.com/johman10/flood-for-transmission/releases/download/latest/flood-for-transmission.tar.gz | tar xz -C /opt/transmission-ui \ diff --git a/openvpn/torguard/updateConfigs.sh b/openvpn/torguard/updateConfigs.sh index ecb121af05..506a60c76c 100755 --- a/openvpn/torguard/updateConfigs.sh +++ b/openvpn/torguard/updateConfigs.sh @@ -13,7 +13,7 @@ curl -L https://torguard.net/downloads/OpenVPN-UDP.zip -o OpenVPN-UDP.zip \ && unzip -j OpenVPN-UDP.zip && rm OpenVPN-UDP.zip # Remove TorGuard prefix of config files and ensure linux line endings -rename 's/^TorGuard\.//' *.ovpn +for old in TorGuard*.ovpn; do new=$(echo $old | sed -e 's/^TorGuard\.//'); mv "$old" "$new"; done # Convert CRLF to Linux sed -i "s/\r$//" *.ovpn