From 4437a9467516a98c655e3970f0905ed3ad30dee0 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 29 Jun 2018 23:13:20 -0700 Subject: [PATCH] Add PYTHONPATH to script environment variables --- Tautulli.py | 2 +- plexpy/notifiers.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Tautulli.py b/Tautulli.py index 05095973..0d571810 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -25,7 +25,7 @@ import os import sys # Ensure lib added to path, before any other imports -sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/')) +sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')) import argparse import locale diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index c2513c92..cfb32676 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -23,9 +23,9 @@ from paho.mqtt.publish import single import os import re import requests -import shlex import smtplib import subprocess +import sys import threading import time from urllib import urlencode @@ -2993,13 +2993,15 @@ class SCRIPTS(Notifier): def run_script(self, script): # Common environment variables - env = {'PLEX_URL': plexpy.CONFIG.PMS_URL, - 'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN, - 'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'), - 'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY, - 'TAUTULLI_ENCODING': plexpy.SYS_ENCODING, - } - env.update(os.environ) + env = os.environ.copy() + env.update({ + 'PLEX_URL': plexpy.CONFIG.PMS_URL, + 'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN, + 'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'), + 'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY, + 'TAUTULLI_ENCODING': plexpy.SYS_ENCODING, + 'PYTHONPATH': (';' if os.name == 'nt' else ':').join(sys.path) + }) try: process = subprocess.Popen(script,