From 08e7ab601cd58d75d90ba0915f115b736c64ba6e Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Fri, 11 Mar 2005 20:47:02 +0000
Subject: [PATCH] Added 'main' attribute to replace binary name on
 command-line.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/head/injector-gui/head@82 9f8c893c-44ee-0310-b757-c8ca8341c71e
---
 gui.py        |  4 ++--
 injector-gui  | 13 ++++++-------
 mainwindow.py |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gui.py b/gui.py
index 2897f92..7af4af6 100644
--- a/gui.py
+++ b/gui.py
@@ -14,14 +14,14 @@ class GUIPolicy(Policy):
 	n_downloads = 0
 	pulse = None
 
-	def __init__(self, interface, prog, prog_args):
+	def __init__(self, interface, prog_args):
 		Policy.__init__(self, interface)
 		global policy
 		assert policy is None
 		policy = self
 
 		import mainwindow
-		self.window = mainwindow.MainWindow(prog, prog_args)
+		self.window = mainwindow.MainWindow(prog_args)
 		self.window.browser.set_root(policy.get_interface(policy.root))
 
 	def monitor_download(self, dl):
diff --git a/injector-gui b/injector-gui
index d081e2c..68e9c8a 100755
--- a/injector-gui
+++ b/injector-gui
@@ -3,16 +3,15 @@ import os, sys
 
 __builtins__._ = lambda x: x
 
-if len(sys.argv) < 3:
-	print "Usage: injector INTERFACE PROG [ARGS]"
-	print "PROG is a relative path inside an implementation of INTERFACE. Eg:"
-	print "injector /uri/0install/site/myprog.xml bin/myprog --help"
+if len(sys.argv) < 2:
+	print "Usage: injector-gui INTERFACE [ARGS]"
+	print "Eg:"
+	print "injector http://example.com/myprog.xml --help"
 	sys.exit(1)
 interface_uri = sys.argv[1]
 if not interface_uri.startswith('http:'):
 	interface_uri = os.path.realpath(interface_uri)	# For testing
-prog = sys.argv[2]
-prog_args = sys.argv[3:]
+prog_args = sys.argv[2:]
 
 import model
 from gui import GUIPolicy
@@ -22,4 +21,4 @@ gtk.rc_parse_string('style "scrolled" { '
 		    'GtkScrolledWindow::scrollbar-spacing = 0}\n'
 		    'class "GtkScrolledWindow" style : gtk "scrolled"\n')
 
-GUIPolicy(interface_uri, prog, prog_args).main()
+GUIPolicy(interface_uri, prog_args).main()
diff --git a/mainwindow.py b/mainwindow.py
index 13b95af..8d55355 100644
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -10,7 +10,7 @@ class MainWindow(Dialog):
 	progress = None
 	browser = None
 
-	def __init__(self, prog, prog_args):
+	def __init__(self, prog_args):
 		Dialog.__init__(self)
 		self.set_title('Dependency Injector')
 		self.set_default_size(400, 300)
@@ -115,7 +115,7 @@ class MainWindow(Dialog):
 			elif resp == gtk.RESPONSE_OK:
 				import run
 				try:
-					run.execute(policy, prog, prog_args)
+					run.execute(policy, prog_args)
 					self.destroy()
 				except SafeException, ex:
 					box = gtk.MessageDialog(self, gtk.DIALOG_MODAL,
-- 
2.11.4.GIT