diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-04-08 10:26:33 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-04-08 10:26:33 -0700 |
commit | 23863db4144fa72868f3712b8e798fea882b0cb6 (patch) | |
tree | 0b437ad7a68dc517340ffc6cd8bd2c6944836422 /indra/viewer_components/manager | |
parent | 6f4b709ab646f3f6483f96e5ee9dce6302ae07d3 (diff) |
SL-321: move arg parsing past platform discovery
Diffstat (limited to 'indra/viewer_components/manager')
-rwxr-xr-x | indra/viewer_components/manager/SL_Launcher | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/viewer_components/manager/SL_Launcher b/indra/viewer_components/manager/SL_Launcher index fb07d3b991..e715546821 100755 --- a/indra/viewer_components/manager/SL_Launcher +++ b/indra/viewer_components/manager/SL_Launcher @@ -22,13 +22,6 @@ import sys import subprocess import Tkinter as tk -parser = argparse.ArgumentParser() -#parser.add_argument('--f', action='store_const', const=42) -args = parser.parse_known_args(sys.argv) -args_list_to_pass = args[1][1:] -args_list_to_pass.insert(0,viewer_binary) -#print "COYOT: arrrrrghs to pass", args_list_to_pass - cwd = os.path.dirname(os.path.realpath(__file__)) executable_name = "" @@ -53,6 +46,13 @@ else: viewer_binary = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),executable_name) +parser = argparse.ArgumentParser() +#parser.add_argument('--f', action='store_const', const=42) +args = parser.parse_known_args(sys.argv) +args_list_to_pass = args[1][1:] +args_list_to_pass.insert(0,viewer_binary) +#print "COYOT: arrrrrghs to pass", args_list_to_pass + #to prove we are launching from the script, launch a Tkinter window first root = tk.Tk() w = tk.Label(root, text=viewer_binary) |