From f6a86c4f740ef505c712382b11be893afa47c666 Mon Sep 17 00:00:00 2001
From: ShaneSmiskol <shane@smiskol.com>
Date: Thu, 20 May 2021 17:15:20 -0700
Subject: [PATCH] for loopify

---
 tools/plotjuggler/install.sh | 16 +++++-----------
 tools/plotjuggler/juggle.py  |  7 +++----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tools/plotjuggler/install.sh b/tools/plotjuggler/install.sh
index d4ef7ac183..27cb0dfb5d 100755
--- a/tools/plotjuggler/install.sh
+++ b/tools/plotjuggler/install.sh
@@ -3,14 +3,8 @@
 mkdir -p bin
 cd bin
 
-wget https://github.com/commaai/PlotJuggler/releases/download/latest/libDataLoadRlog.so.tar.gz
-tar -xf libDataLoadRlog.so.tar.gz
-rm libDataLoadRlog.so.tar.gz
-
-wget https://github.com/commaai/PlotJuggler/releases/download/latest/libDataStreamCereal.so.tar.gz
-tar -xf libDataStreamCereal.so.tar.gz
-rm libDataStreamCereal.so.tar.gz
-
-wget https://github.com/commaai/PlotJuggler/releases/download/latest/plotjuggler.tar.gz
-tar -xf plotjuggler.tar.gz
-rm plotjuggler.tar.gz
+for lib_name in libDataLoadRlog.so libDataStreamCereal.so plotjuggler; do
+  wget https://github.com/commaai/PlotJuggler/releases/download/latest/${lib_name}.tar.gz
+  tar -xf ${lib_name}.tar.gz
+  rm ${lib_name}.tar.gz
+done
diff --git a/tools/plotjuggler/juggle.py b/tools/plotjuggler/juggle.py
index 54b9728bc6..591503e46b 100755
--- a/tools/plotjuggler/juggle.py
+++ b/tools/plotjuggler/juggle.py
@@ -27,13 +27,15 @@ def load_segment(segment_name):
 def start_juggler(fn=None, dbc=None, layout=None):
   env = os.environ.copy()
   env["BASEDIR"] = BASEDIR
+  pj = os.getenv("PLOTJUGGLER_PATH", "plotjuggler")
 
   if dbc:
     env["DBC_NAME"] = dbc
 
   extra_args = []
-  if fn is None:  # streaming
+  if fn is None:  # streaming, just start PJ
     print("Select \"Cereal Subscriber\" in plugin list and click Start!")
+    print("Make sure to set environment variable `ZMQ` if needed")
   else:
     extra_args.append(f'-d {fn}')
 
@@ -41,9 +43,6 @@ def start_juggler(fn=None, dbc=None, layout=None):
     extra_args.append(f'-l {layout}')
 
   extra_args = " ".join(extra_args)
-
-  pj = os.getenv("PLOTJUGGLER_PATH", "plotjuggler")
-  print(f'{pj} --plugin_folders {os.path.join(juggle_dir, "bin")} {extra_args}')
   subprocess.call(f'{pj} --plugin_folders {os.path.join(juggle_dir, "bin")} {extra_args}', shell=True, env=env, cwd=juggle_dir)
 
 def juggle_route(route_name, segment_number, qlog, can, stream, layout):