Add PYTHONPATH to script environment variables

Tautulli.py

@@ -25,7 +25,7 @@
 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

plexpy/notifiers.py

@@ -23,9 +23,9 @@
 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 @@ def list_scripts(self):
 
     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,