Skip to content

Commit ee01c0e

Browse files
radgedehesa
authored andcommitted
Fix ‘mullvad status’ issues
1 parent 4bc798a commit ee01c0e

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

commands/apps/mullvad/connect.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,5 @@ if [ $success -ne 0 ]; then
3030
exit 1
3131
fi
3232

33-
status=$(mullvad status --location)
34-
relay=$(echo "$status" | sed -n '2 s/Relay: //p')
35-
location=$(echo "$status" | sed -n '5 s/Location: //p')
36-
echo "Successfully connected to $relay ($location)"
33+
status=$(mullvad status)
34+
echo "$status"

commands/apps/mullvad/location.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,5 @@ if [ $success -ne 0 ]; then
4141
exit 1
4242
fi
4343

44-
status=$(mullvad status --location)
45-
relay=$(echo "$status" | sed -n '2 s/Relay: //p')
46-
location=$(echo "$status" | sed -n '5 s/Location: //p')
47-
echo "Successfully connected to $relay ($location)"
44+
status=$(mullvad status)
45+
echo "$status"

commands/apps/mullvad/reconnect.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,4 @@ if [[ $status == *"Tunnel status: Disconnected"* ]]; then
3636
exit 0
3737
fi
3838

39-
relay=$(echo "$status" | sed -n '2 s/Relay: //p')
40-
location=$(echo "$status" | sed -n '5 s/Location: //p')
41-
echo "Successfully reconnected to $relay ($location)"
39+
echo "$status"

commands/apps/mullvad/status.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,16 @@ if ! command -v mullvad &> /dev/null; then
2525
exit 1
2626
fi
2727

28-
status=$(mullvad status --location)
28+
status=$(mullvad status)
2929

3030
success=$?
3131
if [ $success -ne 0 ]; then
3232
echo "⚠️ Failed to update VPN tunnel connection status"
3333
exit 1
3434
fi
3535

36-
if [[ $status == *"Tunnel status: Disconnected"* ]]; then
36+
if [[ $status == *"Disconnected"* ]]; then
3737
echo "❌ Disconnected and unsecured"
3838
else
39-
relay=$(echo "$status" | sed -n '2 s/Relay: //p')
40-
location=$(echo "$status" | sed -n '5 s/Location: //p')
41-
echo "✅ Connected to $relay ($location)"
39+
echo "$status"
4240
fi

0 commit comments

Comments
 (0)