diff --git a/python_apps/media-monitor/install/media-monitor-initialize.py b/python_apps/media-monitor/install/media-monitor-initialize.py index 017fdfe70..41a044a48 100644 --- a/python_apps/media-monitor/install/media-monitor-initialize.py +++ b/python_apps/media-monitor/install/media-monitor-initialize.py @@ -1,4 +1,4 @@ -from subprocess import Popen +import subprocess import os if os.geteuid() != 0: @@ -11,16 +11,11 @@ try: os.makedirs("/var/tmp/airtime/media-monitor") #update-rc.d init script - p = Popen("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] + subprocess.call("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True) #Start media-monitor daemon print "* Waiting for media-monitor processes to start..." - """ - p = Popen("invoke-rc.d airtime-media-monitor stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] - """ - p = Popen("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) - sts = os.waitpid(p.pid, 0)[1] + + subprocess.call("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) except Exception, e: print e diff --git a/python_apps/media-monitor/install/media-monitor-uninitialize.py b/python_apps/media-monitor/install/media-monitor-uninitialize.py index a7cca67dc..84c8fb139 100644 --- a/python_apps/media-monitor/install/media-monitor-uninitialize.py +++ b/python_apps/media-monitor/install/media-monitor-uninitialize.py @@ -1,4 +1,4 @@ -from subprocess import Popen +import subprocess import os import sys @@ -9,8 +9,7 @@ if os.geteuid() != 0: try: print "Waiting for media-monitor processes to stop...", if (os.path.exists('/etc/init.d/airtime-media-monitor')): - p = Popen("invoke-rc.d airtime-media-monitor stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] + subprocess.call("invoke-rc.d airtime-media-monitor stop", shell=True) print "OK" else: print "Wasn't running" diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py index daccc8d9c..f5098d77e 100644 --- a/python_apps/pypo/install/pypo-initialize.py +++ b/python_apps/pypo/install/pypo-initialize.py @@ -1,6 +1,7 @@ import platform import shutil from subprocess import Popen, PIPE +import subprocess import sys import os sys.path.append('/usr/lib/airtime/') @@ -115,17 +116,14 @@ try: print "Unable to connect to the Airtime server." #initialize init.d scripts - p = Popen("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] + subprocess.call("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True) #clear out an previous pypo cache print "* Clearing previous pypo cache" - p = Popen("rm -rf '/var/tmp/airtime/pypo/cache/scheduler/*' >/dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] - + subprocess.call("rm -rf '/var/tmp/airtime/pypo/cache/scheduler/*' >/dev/null 2>&1", shell=True) + print "* Waiting for pypo processes to start..." - p = Popen("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] + subprocess.call("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) except Exception, e: print e diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index 2329e88e7..19d27768d 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -1,6 +1,6 @@ -from subprocess import Popen import os import sys +import subprocess if os.geteuid() != 0: print "Please run this as root." @@ -10,8 +10,7 @@ try: #stop pypo and liquidsoap processes print "Waiting for pypo processes to stop...", if (os.path.exists('/etc/init.d/airtime-playout')): - p = Popen("invoke-rc.d airtime-playout stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] + subprocess.call("invoke-rc.d airtime-playout stop", shell=True) print "OK" else: print "Wasn't running"