From 1ff1270bfa814db7b0fdafa21e0ce1b0689dbeb2 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sat, 30 Jan 2016 16:18:45 -0800
Subject: [PATCH] Clean up powershell for scripts

---
 plexpy/notifiers.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 85b5cf1a..092eb9b9 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1777,7 +1777,7 @@ class SLACK(object):
 class Scripts(object):
 
     def __init__(self, **kwargs):
-        self.script_exts = ('.bat', '.cmd', '.exe', '.php', '.pl', '.py', '.pyw', '.rb', '.sh', '.ps1')
+        self.script_exts = ('.bat', '.cmd', '.exe', '.php', '.pl', '.ps1', '.py', '.pyw', '.rb', '.sh')
 
     def conf(self, options):
         return cherrypy.config['config'].get('Scripts', options)
@@ -1872,18 +1872,18 @@ class Scripts(object):
 
         name, ext = os.path.splitext(script)
 
-        if ext == '.py':
-            prefix = 'python'
-        elif ext == '.pyw':
-            prefix = 'pythonw'
-        elif ext == '.php':
+        if ext == '.php':
             prefix = 'php'
         elif ext == '.pl':
             prefix = 'perl'
-        elif ext == '.rb':
-            prefix = 'ruby'
         elif ext == '.ps1':
             prefix = 'powershell -executionPolicy bypass -file'
+        elif ext == '.py':
+            prefix = 'python'
+        elif ext == '.pyw':
+            prefix = 'pythonw'
+        elif ext == '.rb':
+            prefix = 'ruby'
         else:
             prefix = ''
 
@@ -1891,10 +1891,7 @@ class Scripts(object):
             script = script.encode(plexpy.SYS_ENCODING, 'ignore')
 
         if prefix:
-            if ext == '.ps1':
-                script = prefix.split() + [script]
-            else:
-                script = [prefix, script]
+            script = prefix.split() + [script]
         else:
             script = [script]