sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only absolutize the command when it doesnt contain already a slash

Browse Source
This commit is contained in:
Tomeu Vizoso 2008-10-21 17:07:03 +02:00
parent 0b7def1788
commit 611bd9ccda
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sugar/activity/activityfactory.py
View File

@ -131,10 +131,13 @@ def get_command(activity, activity_id=None, object_id=None, uri=None):
if uri is not None:
command.extend(['-u', uri])
bin_path = os.path.join(activity.get_path(), 'bin')
absolute_path = os.path.join(bin_path, command[0])
if os.path.exists(absolute_path):
command[0] = absolute_path
# if the command is in $BUNDLE_ROOT/bin, execute the absolute path so there
# is no need to mangle with the shell's PATH
if '/' not in command[0]:
bin_path = os.path.join(activity.get_path(), 'bin')
absolute_path = os.path.join(bin_path, command[0])
if os.path.exists(absolute_path):
command[0] = absolute_path
logging.debug('launching: %r' % command)