From bccaa1bbeecb45b34bbe39e9b9095e54ffd7a576 Mon Sep 17 00:00:00 2001
From: 4s3ti <4s3ti@protonmail.com>
Date: Thu, 28 Jan 2021 01:33:03 +0100
Subject: [PATCH] Fix for #1234 & CI/CD Fine-tunning

Changed Exit code from 1 to 0
Added some more checks
Changed order some checks are done
---
 .travis.yml                     | 9 ++++++---
 scripts/wireguard/clientSTAT.sh | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4077c28..5f528d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,9 +65,9 @@ jobs:
         - pivpn add -o -n foo
         - pivpn -bk
         - ls ~pi/pivpnbackup/ | grep backup
-        - pivpn -r foo -y
         - pivpn -l
         - pivpn -c
+        - pivpn -r foo -y
       after_fail:
         - sudo journalctl -xe
 
@@ -84,6 +84,7 @@ jobs:
         - pivpn add -n foo
         - pivpn -qr foo
         - pivpn -bk
+        - ls ~pi/pivpnbackup/ | grep backup
         - pivpn -l
         - pivpn -c
         - pivpn -r foo -y
@@ -108,9 +109,9 @@ jobs:
         - pivpn add -o -n foo
         - pivpn -bk
         - ls ~pi/pivpnbackup/ | grep backup
-        - pivpn -r foo -y
         - pivpn -l
         - pivpn -c
+        - pivpn -r foo -y
       after_fail:
         - sudo journalctl -xe
 
@@ -129,6 +130,7 @@ jobs:
         - pivpn add -n foo
         - pivpn -qr foo
         - pivpn -bk
+        - ls ~pi/pivpnbackup/ | grep backup
         - pivpn -l
         - pivpn -c
         - pivpn -r foo -y
@@ -151,9 +153,9 @@ jobs:
         - pivpn add -o -n foo
         - pivpn -bk
         - ls ~pi/pivpnbackup/ | grep backup
-        - pivpn -r foo -y
         - pivpn -l
         - pivpn -c
+        - pivpn -r foo -y
       after_fail:
         - sudo journalctl -xe
 
@@ -171,6 +173,7 @@ jobs:
         - pivpn add -n foo
         - pivpn -qr foo
         - pivpn -bk
+        - ls ~pi/pivpnbackup/ | grep backup
         - pivpn -l
         - pivpn -c
         - pivpn -r foo -y
diff --git a/scripts/wireguard/clientSTAT.sh b/scripts/wireguard/clientSTAT.sh
index 0df3664..f47e800 100755
--- a/scripts/wireguard/clientSTAT.sh
+++ b/scripts/wireguard/clientSTAT.sh
@@ -6,7 +6,7 @@ CONF_FILE="/etc/wireguard/wg0.conf"
 
 if [ ! -s "$CLIENTS_FILE" ]; then
     echo "::: There are no clients to list"
-    exit 1
+    exit 0
 fi
 
 scriptusage(){