From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 2 Aug 2002 15:31:25 +0000 (+0000)
Subject: Hmm, in some cases we don't seem to get our scriptname in argv[0].
X-Git-Tag: v2.3c1~4782
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e6c80bf5edfc8b9fff06cdb26af532d6894c9a2;p=thirdparty%2FPython%2Fcpython.git

Hmm, in some cases we don't seem to get our scriptname in argv[0].
Cater for that by working from sys.executable.
---

diff --git a/Mac/Lib/appletrawmain.py b/Mac/Lib/appletrawmain.py
index d2fcd6eb8c94..29c8a5762de5 100644
--- a/Mac/Lib/appletrawmain.py
+++ b/Mac/Lib/appletrawmain.py
@@ -9,14 +9,25 @@ import os
 import sys
 import marshal
 
+#
+# Make sure we have an argv[0], and make _dir point to the Resources
+# directory.
+#
+if not sys.argv or sys.argv[0][:1] == '-':
+	# Insert our (guessed) name.
+	_dir = os.path.split(sys.executable)[0] # removes "python"
+	_dir = os.path.split(_dir)[0] # Removes "MacOS"
+	_dir = os.path.join(_dir, 'Resources')
+	sys.argv.insert(0, '__rawmain__')
+else:
+	_dir = os.path.split(sys.argv[0])[0]
 #
 # Create sys.argv
 #
 argvemulator.ArgvCollector().mainloop()
 #
-# Find the realy main program to run
+# Find the real main program to run
 #
-_dir = os.path.split(sys.argv[0])[0]
 __file__ = os.path.join(_dir, '__main__.py')
 if os.path.exists(__file__):
 	#