From 7b779503524c8641a402cc670e716d9b5cf0e2f4 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sat, 24 Jun 2023 14:34:30 +0100
Subject: [PATCH] Address lint concerns

---
 scripts/n2n-ctl                       |  4 ++--
 scripts/test_integration_edge.sh      | 22 +++++++++++-----------
 scripts/test_integration_supernode.sh | 16 ++++++++--------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/scripts/n2n-ctl b/scripts/n2n-ctl
index 84b48cb..e389ecb 100755
--- a/scripts/n2n-ctl
+++ b/scripts/n2n-ctl
@@ -48,7 +48,7 @@ class JsonUDP():
             data = json.loads(data.decode('utf8'))
 
             # TODO: We assume the first packet we get will be tagged for us
-            assert(data['_tag'] == tagstr)
+            assert (data['_tag'] == tagstr)
 
             if data['_type'] == 'error':
                 raise ValueError('Error: {}'.format(data['error']))
@@ -128,7 +128,7 @@ class JsonUDP():
         data, _ = self.sock.recvfrom(1024)
         data = json.loads(data.decode('utf8'))
         # assert(data['_tag'] == tagstr)
-        assert(data['_type'] == 'event')
+        assert (data['_type'] == 'event')
 
         del data['_tag']
         del data['_type']
diff --git a/scripts/test_integration_edge.sh b/scripts/test_integration_edge.sh
index 93a5424..4c6ee80 100755
--- a/scripts/test_integration_edge.sh
+++ b/scripts/test_integration_edge.sh
@@ -16,16 +16,16 @@ docmd() {
 }
 
 # start a supernode
-docmd ${BINDIR}/supernode -v
+docmd "${BINDIR}"/supernode -v
 
 # Start the edge in the background
-docmd sudo ${BINDIR}/edge -l localhost:7654 -c test >/dev/null
+docmd sudo "${BINDIR}"/edge -l localhost:7654 -c test >/dev/null
 # TODO:
 # - send edge messages to stderr?
 
-docmd ${TOPDIR}/scripts/n2n-ctl communities
-docmd ${TOPDIR}/scripts/n2n-ctl packetstats
-docmd ${TOPDIR}/scripts/n2n-ctl edges --raw
+docmd "${TOPDIR}"/scripts/n2n-ctl communities
+docmd "${TOPDIR}"/scripts/n2n-ctl packetstats
+docmd "${TOPDIR}"/scripts/n2n-ctl edges --raw
 
 # TODO:
 # docmd ${TOPDIR}/scripts/n2n-ctl supernodes --raw
@@ -35,15 +35,15 @@ docmd ${TOPDIR}/scripts/n2n-ctl edges --raw
 #   - last_seen timestamp
 #   - uptime
 
-docmd ${TOPDIR}/scripts/n2n-ctl verbose
-docmd ${TOPDIR}/scripts/n2n-ctl --write verbose 1 2>/dev/null
+docmd "${TOPDIR}"/scripts/n2n-ctl verbose
+docmd "${TOPDIR}"/scripts/n2n-ctl --write verbose 1 2>/dev/null
 echo $?
-docmd ${TOPDIR}/scripts/n2n-ctl -k $AUTH --write verbose 1
+docmd "${TOPDIR}"/scripts/n2n-ctl -k $AUTH --write verbose 1
 
 # looks strange, but we are querying the state of the "stop" verb
-docmd ${TOPDIR}/scripts/n2n-ctl stop
+docmd "${TOPDIR}"/scripts/n2n-ctl stop
 
 # stop them both
-docmd ${TOPDIR}/scripts/n2n-ctl -k $AUTH --write stop
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write stop
+docmd "${TOPDIR}"/scripts/n2n-ctl -k $AUTH --write stop
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write stop
 
diff --git a/scripts/test_integration_supernode.sh b/scripts/test_integration_supernode.sh
index 57f44bc..4d5145d 100755
--- a/scripts/test_integration_supernode.sh
+++ b/scripts/test_integration_supernode.sh
@@ -16,18 +16,18 @@ docmd() {
 }
 
 # start it running in the background
-docmd ${BINDIR}/supernode -v
+docmd "${BINDIR}"/supernode -v
 
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 communities
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 packetstats
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 edges --raw
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 communities
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 packetstats
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 edges --raw
 
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 verbose
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write verbose 1
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 verbose
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write verbose 1
 
 # looks strange, but we are querying the state of the "stop" verb
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 stop
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 stop
 
 # stop it
-docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write stop
+docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write stop