From 278311cc16be7b3857634ec8c76b28442d4f31e9 Mon Sep 17 00:00:00 2001
From: Yaroslav <contact@yaroslavps.com>
Date: Mon, 3 Feb 2020 13:14:07 +0300
Subject: vpn script improvements

---
 dotfiles/.local/bin/swaysession | 2 ++
 dotfiles/.local/bin/togglevpn   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'dotfiles/.local')

diff --git a/dotfiles/.local/bin/swaysession b/dotfiles/.local/bin/swaysession
index 0507368..c4fa4db 100755
--- a/dotfiles/.local/bin/swaysession
+++ b/dotfiles/.local/bin/swaysession
@@ -21,9 +21,11 @@ case "$1" in
         lock-color & sleep 1 && $logind hibernate
         ;;
     reboot)
+        rm -f ~/.cache/openvpnpid
         $logind reboot
         ;;
     poweroff)
+        rm -f ~/.cache/openvpnpid
         $logind poweroff
         ;;
     *)
diff --git a/dotfiles/.local/bin/togglevpn b/dotfiles/.local/bin/togglevpn
index f1a6bdb..88add47 100755
--- a/dotfiles/.local/bin/togglevpn
+++ b/dotfiles/.local/bin/togglevpn
@@ -1,10 +1,16 @@
 #!/bin/sh
 
 if [ -f "$HOME/.cache/openvpnpid" ]; then
+  rm ~/.cache/openvpnpid
   sudo killall -SIGINT openvpn
   exit
 fi
 
+if [ ! -f "$HOME/.config/ovpn/conf.ovpn" ]; then
+  notify-send "🔐 OpenVPN" "Can't start VPN. Configuration file is missing"
+  exit
+fi
+
 sudo openvpn "$HOME/.config/ovpn/conf.ovpn" &
 PID=$!
 notify-send "🔐 OpenVPN" "VPN is being initialized"
@@ -12,5 +18,5 @@ echo $PID > ~/.cache/openvpnpid
 killall -40 waybar
 wait $PID
 notify-send "🔐 OpenVPN" "VPN service has stopped with exit code $?"
-rm ~/.cache/openvpnpid
+rm -f ~/.cache/openvpnpid
 killall -40 waybar
-- 
cgit v1.2.3