Implement a sugar-launch command. Works like the old sugar-activity

but should deal fine with native activities too.

3 files changed, 43 insertions, 30 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 69efe43..94d7cc0 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,7 +4,8 @@ sugar_SCRIPTS = sugar-activity-factory
 bin_SCRIPTS = 			\
 	sugar			\
 	sugar-activity		\
-	sugar-install-bundle
+	sugar-install-bundle	\
+	sugar-launch
 
 EXTRA_DIST =                    \
 	$(bin_SCRIPTS)		\
diff --git a/bin/sugar-activity-factory b/bin/sugar-activity-factory
deleted file mode 100755
index a144f34..0000000
--- a/bin/sugar-activity-factory
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import sys
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-
-from sugar.activity import activityfactoryservice
-
-activityfactoryservice.run_with_args(sys.argv)
-
-gtk.main()
diff --git a/bin/sugar-launch b/bin/sugar-launch
new file mode 100644
index 0000000..6cb53e1
--- /dev/null
+++ b/bin/sugar-launch
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2007, Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+import sys
+from optparse import OptionParser
+
+from sugar.activity import activityfactory
+from sugar.activity.registry import get_registry
+
+usage = "usage: %prog [options] activity"
+parser = OptionParser(usage)
+(options, args) = parser.parse_args()
+
+if len(args) == 0:
+    print 'You need to specify the activity name or part of it.'
+    sys.exit(1)
+
+registry = get_registry()
+activities = registry.find_activity(args[0])
+if len(activities) == 0:
+    print 'Activity not found.'
+
+activity = activities[0]
+args = activityfactory.get_command(activity).split(' ')
+os.execvpe(args[0], args, activityfactory.get_environment(activity))