From a0d9af45e9efc5296c79cc76f0a3d84dff6ff829 Mon Sep 17 00:00:00 2001 From: Johannes Pohl Date: Sun, 26 Nov 2017 23:25:50 +0100 Subject: [PATCH] avoid gnuradio conflicts with bundled interpreter on windows (#366) --- src/urh/dev/gr/scripts/airspy_recv.py | 4 +++- src/urh/dev/gr/scripts/bladerf_recv.py | 2 ++ src/urh/dev/gr/scripts/bladerf_send.py | 2 ++ src/urh/dev/gr/scripts/funcube-dongle_recv.py | 2 ++ src/urh/dev/gr/scripts/hackrf_recv.py | 2 ++ src/urh/dev/gr/scripts/hackrf_send.py | 2 ++ src/urh/dev/gr/scripts/rtl-sdr_recv.py | 2 ++ src/urh/dev/gr/scripts/sdrplay_recv.py | 2 ++ src/urh/dev/gr/scripts/usrp_recv.py | 2 ++ src/urh/dev/gr/scripts/usrp_send.py | 2 ++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/urh/dev/gr/scripts/airspy_recv.py b/src/urh/dev/gr/scripts/airspy_recv.py index 13c11a6039..8cb27f1bf3 100644 --- a/src/urh/dev/gr/scripts/airspy_recv.py +++ b/src/urh/dev/gr/scripts/airspy_recv.py @@ -6,15 +6,17 @@ ################################################## from optparse import OptionParser - import tempfile import os import sys + try: with open(os.path.join(tempfile.gettempdir(), "gnuradio_path.txt"), "r") as f: gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/bladerf_recv.py b/src/urh/dev/gr/scripts/bladerf_recv.py index 62e9f5319e..60e3e1aa7c 100644 --- a/src/urh/dev/gr/scripts/bladerf_recv.py +++ b/src/urh/dev/gr/scripts/bladerf_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/bladerf_send.py b/src/urh/dev/gr/scripts/bladerf_send.py index ce8b37c857..facf845325 100644 --- a/src/urh/dev/gr/scripts/bladerf_send.py +++ b/src/urh/dev/gr/scripts/bladerf_send.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/funcube-dongle_recv.py b/src/urh/dev/gr/scripts/funcube-dongle_recv.py index c27939e6bc..8efbe3d3e9 100755 --- a/src/urh/dev/gr/scripts/funcube-dongle_recv.py +++ b/src/urh/dev/gr/scripts/funcube-dongle_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/hackrf_recv.py b/src/urh/dev/gr/scripts/hackrf_recv.py index 49d742af09..e4ffc730f0 100755 --- a/src/urh/dev/gr/scripts/hackrf_recv.py +++ b/src/urh/dev/gr/scripts/hackrf_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/hackrf_send.py b/src/urh/dev/gr/scripts/hackrf_send.py index 3d97b16a71..900734b93c 100755 --- a/src/urh/dev/gr/scripts/hackrf_send.py +++ b/src/urh/dev/gr/scripts/hackrf_send.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/rtl-sdr_recv.py b/src/urh/dev/gr/scripts/rtl-sdr_recv.py index 59fa206569..c196edf0f9 100755 --- a/src/urh/dev/gr/scripts/rtl-sdr_recv.py +++ b/src/urh/dev/gr/scripts/rtl-sdr_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/sdrplay_recv.py b/src/urh/dev/gr/scripts/sdrplay_recv.py index 4e65363eb8..5f7008cb3f 100644 --- a/src/urh/dev/gr/scripts/sdrplay_recv.py +++ b/src/urh/dev/gr/scripts/sdrplay_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/usrp_recv.py b/src/urh/dev/gr/scripts/usrp_recv.py index b9691cda6c..7cd035e2c8 100755 --- a/src/urh/dev/gr/scripts/usrp_recv.py +++ b/src/urh/dev/gr/scripts/usrp_recv.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: diff --git a/src/urh/dev/gr/scripts/usrp_send.py b/src/urh/dev/gr/scripts/usrp_send.py index b1e9270de7..0b5d3d33ec 100755 --- a/src/urh/dev/gr/scripts/usrp_send.py +++ b/src/urh/dev/gr/scripts/usrp_send.py @@ -15,6 +15,8 @@ gnuradio_path = f.read().strip() os.environ["PATH"] = os.path.join(gnuradio_path, "bin") + # Append script path at end to prevent conflicts in case of frozen interpreter + sys.path.append(sys.path.pop(0)) sys.path.insert(0, os.path.join(gnuradio_path, "lib", "site-packages")) except IOError: