Author: duncan
Date: Tue Dec 26 12:02:55 2006
New Revision: 8810
Modified:
branches/rel-1/freevo/freevo
Log:
Removed old cvs log
Some small whitespace tidy-ups
Modified: branches/rel-1/freevo/freevo
==============================================================================
--- branches/rel-1/freevo/freevo (original)
+++ branches/rel-1/freevo/freevo Tue Dec 26 12:02:55 2006
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-#if 0 /*
# -----------------------------------------------------------------------
# freevo - the main entry point to the whole suite of applications
# -----------------------------------------------------------------------
@@ -10,52 +9,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.113 2004/06/08 19:34:12 dischi
-# fix bad freevo_script for installed version
-#
-# Revision 1.112 2004/06/08 19:11:56 dischi
-# support direct start without execute
-#
-# Revision 1.111 2004/04/12 05:34:14 dischi
-# extend PATH and set HOME and USER
-#
-# Revision 1.110 2004/02/10 00:17:52 rshortt
-# Use env from /usr/bin rather than /bin. I beleive it is standard in
/usr/bin,
-# looking in /bin breaks Debian and others while it is available in both places
-# (so I have been told) in RedHat and Gentoo.
-#
-# Also standardize the naming of pid files.
-#
-# Revision 1.109 2004/02/06 18:01:21 dischi
-# fix bug with helper softlinks
-#
-# Revision 1.108 2004/01/26 19:33:17 dischi
-# python 2.2 has no True/False
-#
-# Revision 1.107 2004/01/10 20:45:50 mikeruelle
-# can not start freevo -fs without this change
-#
-# Revision 1.106 2004/01/10 18:24:17 dischi
-# fix uid storage for execute and runapp calls
-#
-# Revision 1.105 2004/01/10 16:53:48 dischi
-# better shutdown
-#
-# Revision 1.104 2004/01/10 14:56:19 dischi
-# better KeyboardInterrupt handling
-#
-# Revision 1.103 2004/01/09 20:18:31 dischi
-# check if programm is still running
-#
-# Revision 1.102 2004/01/09 18:55:53 dischi
-# helper stop fixes
-#
-# Revision 1.101 2004/01/07 21:59:10 dischi
-# replace the shell script with a nice python version
-#
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2003 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -74,9 +27,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
-#endif
-
+# -----------------------------------------------------------------------
import os
import sys
@@ -125,7 +76,6 @@
sys.exit(0)
-
def get_python(check_freevo):
"""
get the newest version of python [ with freevo installed ]
@@ -177,7 +127,6 @@
return None, None
return None
-
def getpid(name, arg):
"""
@@ -243,7 +192,6 @@
return 0
-
def start(name, arg, bg, store=1):
"""
start a process
@@ -273,7 +221,9 @@
else:
os.execvp(arg[0], arg)
-
+#--------------------------------------------------------------------------------
+# Main block
+#--------------------------------------------------------------------------------
freevo_script = os.path.abspath(sys.argv[0])
if os.path.islink(freevo_script):
freevo_script = os.readlink(freevo_script)
@@ -311,7 +261,7 @@
#
python = get_python(0)
if not python:
- print 'can\'t find python >= 2.2'
+ print 'Can\'t find python >= 2.3'
sys.exit(0)
python = [ python ]
runapp = ''
@@ -336,8 +286,6 @@
runapp = ''
python = [ python ]
-
-
# add the variables from above into environ so Freevo can use them, too
for var in ('freevo_script', 'runapp', 'freevo_python', 'freevo_locale',
'freevo_share', 'freevo_contrib', 'freevo_config',
'freevo_helpers'):
@@ -370,14 +318,11 @@
else:
arg = ''
-
# check the arg
-
if arg in ('--help', '-h'):
# show help
show_help()
-
if arg == 'stop':
# stop running freevo
if not stop(name, python + proc):
@@ -389,7 +334,6 @@
sys.argv = [ sys.argv[0] ]
bg = 1
-
elif arg == '-fs':
# start X server and run freevo, ignore everything else for now
server_num = 0
@@ -400,7 +344,6 @@
sys.stdin.close()
os.execvp('xinit', [ 'xinit', freevo_script, '-force-fs', '--',
':'+str(server_num) ])
-
elif arg == 'execute':
# execute a python script
proc = sys.argv[2:]
@@ -410,12 +353,10 @@
# run setup
proc = [ os.path.join(freevo_python, 'setup_freevo.py') ] + sys.argv[2:]
-
elif arg == 'prompt':
# only run python inside the freevo env
proc = []
-
elif arg == 'runapp':
# Oops, runapp. We don't start python, we start sys.argv[1]
# with the rest as args
@@ -439,7 +380,6 @@
else:
sys.argv = [ sys.argv[0] ] + sys.argv[2:]
-
elif arg and name == 'freevo' and not (arg in ['-force-fs', '-trace', '-doc']):
# ok, don't know about that arg, freevo should be started, but
# it's also no freevo arg
@@ -447,7 +387,6 @@
print
show_help()
-
else:
# arg for freevo
proc += sys.argv[1:]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
