Fix error on update-port.sh (pia/perfectprivacy/privatevpn) with custom RPC port defined (#1574)

* Update update-port.sh

* Add TRANSMISSION_RPC_PORT to transmission-remote cmd

* Remove some unnecessary space at eol

* Update update-port.sh

Resolving conflict with master branch

* Delete update-port.sh

Co-authored-by: Patrick Kishino <patrick.a.kishino@gmail.com>
This commit is contained in:
Decaux Nicolas 2021-01-19 03:03:51 +01:00 committed by GitHub
parent 7b453b9d31
commit 960db0b603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -25,7 +25,7 @@ pass=$(sed -n 2p /config/openvpn-credentials.txt)
pf_host=$(ip route | grep tun | grep -v src | head -1 | awk '{ print $3 }')
###### Nextgen PIA port forwarding ##################
get_auth_token () {
tok=$(curl --insecure --silent --show-error --request POST --max-time $curl_max_time \
--header "Content-Type: application/json" \
@ -96,13 +96,13 @@ fi
# make sure transmission is running and accepting requests
echo "waiting for transmission to become responsive"
until torrent_list="$(transmission-remote $myauth -l)"; do sleep 10; done
until torrent_list="$(transmission-remote $TRANSMISSION_RPC_PORT $myauth -l)"; do sleep 10; done
echo "transmission became responsive"
output="$(echo "$torrent_list" | tail -n 2)"
echo "$output"
# get current listening port
transmission_peer_port=$(transmission-remote $myauth -si | grep Listenport | grep -oE '[0-9]+')
transmission_peer_port=$(transmission-remote $TRANSMISSION_RPC_PORT $myauth -si | grep Listenport | grep -oE '[0-9]+')
if [[ "$new_port" != "$transmission_peer_port" ]]; then
if [[ "true" = "$ENABLE_UFW" ]]; then
echo "Update UFW rules before changing port in Transmission"
@ -115,11 +115,11 @@ if [[ "$new_port" != "$transmission_peer_port" ]]; then
fi
echo "setting transmission port to $new_port"
transmission-remote ${myauth} -p "$new_port"
transmission-remote ${TRANSMISSION_RPC_PORT} ${myauth} -p "$new_port"
echo "Checking port..."
sleep 10
transmission-remote ${myauth} -pt
transmission-remote ${TRANSMISSION_RPC_PORT} ${myauth} -pt
else
echo "No action needed, port hasn't changed"
fi

View File

@ -62,7 +62,7 @@ fi
# get current listening port
sleep 3
transmission_peer_port=$(transmission-remote $myauth -si | grep Listenport | grep -oE '[0-9]+')
transmission_peer_port=$(transmission-remote $TRANSMISSION_RPC_PORT $myauth -si | grep Listenport | grep -oE '[0-9]+')
if [ "$new_port" != "$transmission_peer_port" ]; then
if [ "true" = "$ENABLE_UFW" ]; then
echo "Update UFW rules before changing port in Transmission"
@ -74,11 +74,11 @@ if [ "$new_port" != "$transmission_peer_port" ]; then
ufw allow ${new_port}
fi
transmission-remote ${myauth} -p "$new_port"
transmission-remote ${TRANSMISSION_RPC_PORT} ${myauth} -p "$new_port"
echo "Checking port..."
sleep 10
transmission-remote ${myauth} -pt
transmission-remote ${TRANSMISSION_RPC_PORT} ${myauth} -pt
else
echo "No action needed, port hasn't changed"
fi