improvements, simplifications

4 files changed, 14 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2f1ab073711..e6cbee5aa20d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Dec 22 10:54:19 UTC 2017
+# Fri Dec 22 22:31:12 UTC 2017
 pkgbase = doomcube
 	pkgdesc = The GPL Cube of Potential Doom.
 	pkgver = 2011
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.kismetwireless.net/doomcube/
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = doomcube
 	source = doomcube-feed
 	source = quiet.patch
 	sha512sums = d79794973a836351de87fe4161e9e9d33d48c2235ebe8c6e8d15e23a395e15127023f61f20df37b2fe4af962da3dcb0abca66b63c65b30d6aedc76b4e2a484d9
-	sha512sums = ce4b36bb0d35384f2766b6b5af06fbc18f3c3dc9fd5f70e141bdf0e4826713fc55952476125a50873d20594abc4b8efb95c2741d8bc1c307fd296f1934129006
-	sha512sums = 15d4fadf8935d90e71aba14a2e66f737ed26d4e6f18ea69e90ccb6d54d85ccdd2efa6e7e6023b9f7588dd61d07b451e4e9b392c37be3451c6b96e9273aace4c1
+	sha512sums = 96e810d5a0d2b1a45228830aa912083e32e0174c2ed7b0caa67fce302cb0a5596741d4ef82aaddb1243a9329aa6cfe7218104fc7c1c7d908784f187e18c75c9d
+	sha512sums = d6070617e200cf36fc7d3d04c937e39a01bae40119daca46582806557d43f87105244550b7af2908e54f5413b970a62cb4ef9f7951ae07a66bfdd7b64778fba2
 
 pkgname = doomcube
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b524ebaff97..669ae5853471 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=doomcube
 pkgver=2011
-pkgrel=1
+pkgrel=2
 pkgdesc="The GPL Cube of Potential Doom."
 arch=('i686' 'x86_64')
 url="https://www.kismetwireless.net/doomcube/"
@@ -13,8 +13,8 @@ source=(http://www.kismetwireless.net/code/doomcube-$pkgver-02-R1.tar.gz
 	doomcube-feed
 	quiet.patch)
 sha512sums=('d79794973a836351de87fe4161e9e9d33d48c2235ebe8c6e8d15e23a395e15127023f61f20df37b2fe4af962da3dcb0abca66b63c65b30d6aedc76b4e2a484d9'
-            'ce4b36bb0d35384f2766b6b5af06fbc18f3c3dc9fd5f70e141bdf0e4826713fc55952476125a50873d20594abc4b8efb95c2741d8bc1c307fd296f1934129006'
-            '15d4fadf8935d90e71aba14a2e66f737ed26d4e6f18ea69e90ccb6d54d85ccdd2efa6e7e6023b9f7588dd61d07b451e4e9b392c37be3451c6b96e9273aace4c1')
+            '96e810d5a0d2b1a45228830aa912083e32e0174c2ed7b0caa67fce302cb0a5596741d4ef82aaddb1243a9329aa6cfe7218104fc7c1c7d908784f187e18c75c9d'
+            'd6070617e200cf36fc7d3d04c937e39a01bae40119daca46582806557d43f87105244550b7af2908e54f5413b970a62cb4ef9f7951ae07a66bfdd7b64778fba2')
 
 prepare() {
 	cd ${srcdir}/doomcube-$pkgver-02-R1
diff --git a/doomcube-feed b/doomcube-feed
index 55555580f5b8..d39105be989f 100755
--- a/doomcube-feed
+++ b/doomcube-feed
@@ -1,26 +1,16 @@
 #!/bin/bash
 
-[[ -n "$1" ]] && SLEEPTIME="$1" || SLEEPTIME="4"
+#[[ -n "$1" ]] && interval="$1" || interval="4"
+interval=$(( $# ? ${1:-0} : 4))
 
 while true; do
-  CONNECTIONS="$(ss -tun | grep '^[a-z]*p' | sed 's|[a-z]*p[ ]*[A-Z]*[ ]*[0-9]*[ ]*[0-9]*[ ]*||g;s|-[A-Z]*.*||g;/^$/d')"
 
-  #ports
-  PORTS="$(echo "${CONNECTIONS}" | sed 's|.*:||1;s| *$||')"
-
-  #ips local
-  IPIN="$(echo "${CONNECTIONS}" | sed 's|:.*||1')"
+  while read -r line; do
 
-  #ips remote
-  IPOUT="$(echo "${CONNECTIONS}" | sed 's|[0-9]*.[0-9]*.[0-9]*.[0-9]*:[0-9]*[ ]*||1;s|:[0-9]*.*||g')"
+    [[ ! "${line}" == "\n" ]] && echo "${line}"
 
-  LINENUM="0"
+  done <<< "$(ss -tun | sed -n '2,$s/.* \([0-9\.]*\):\([0-9]*\) *\([0-9\.]*\):\([0-9]*\)/\1 \3 \2/p')"
 
-  while read -r line; do
-    ((LINENUM++))
-    OUTPUT="$(echo "${IPIN}"| sed -n "${LINENUM}p") $(echo "${IPOUT}"| sed -n "${LINENUM}p") $(echo "${PORTS}"| sed -n "${LINENUM}p")"
-    [[ ! "${OUTPUT}" == "\n" ]] && echo "${OUTPUT}"
-  done <<< "${CONNECTIONS}"
+  sleep "${interval}"
 
-  sleep "${SLEEPTIME}"
 done
diff --git a/quiet.patch b/quiet.patch
index 27cc7a352d93..d66684979b20 100644
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,11 +1,10 @@
 --- src/doomcube-2011-02-R1/sdl_doomcube.cc	2011-02-17 07:00:31.000000000 +0900
 +++ src/doomcube-2011-02-R1/sdl_doomcube.cc	2015-02-09 00:10:00.678192430 +0900
-@@ -196,7 +196,7 @@
+@@ -196,7 +196,6 @@
  			else if (glob_angle >= 78)
  				cdelta = 78 / glob_angle;
  
 -			printf("angle %d delta %f\n", glob_angle, cdelta);
-+			//printf("angle %d delta %f\n", glob_angle, cdelta);
  			glColor3f(0.3f * cdelta, 0.3f * cdelta, 0.3f * cdelta);
  
  			// Yellow