Merge branch 'cc-2015-on-reboot-resume-show' into devel

Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
This commit is contained in:
martin 2011-06-17 15:10:33 -04:00
commit 2e4519f156
32 changed files with 401 additions and 389 deletions

View file

@ -66,10 +66,6 @@ try:
#os.system("chmod -R 755 "+config["bin_dir"]+"/airtime-media-monitor)
os.system("chown -R pypo:pypo "+config["bin_dir"])
print "Creating symbolic links"
os.system("rm -f /usr/bin/airtime-media-monitor")
os.system("ln -s "+config["bin_dir"]+"/airtime-media-monitor /usr/bin/")
print "Installing media-monitor daemon"
shutil.copy(config["bin_dir"]+"/airtime-media-monitor-init-d", "/etc/init.d/airtime-media-monitor")

View file

@ -12,7 +12,7 @@ if os.geteuid() != 0:
PATH_INI_FILE = '/etc/airtime/media-monitor.cfg'
def remove_path(path):
os.system("rm -rf " + path)
os.system('rm -rf "%s"' % path)
def get_current_script_dir():
current_script_dir = os.path.realpath(__file__)