diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-05 20:33:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-05 20:33:19 -0400 |
| commit | 137c8db8cc1aa49a306531413e9cba5688cb9990 (patch) | |
| tree | dc27646bb1866e330d78049c0b80e6b1adfad519 /indra/newview | |
| parent | 42931d67a15d9a018f06ec2e5fc8d78549ab4cd8 (diff) | |
SL-957: Previous commit skipped a couple assignments used later.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d70dbed9e0..aa03780e19 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -930,11 +930,13 @@ class DarwinManifest(ViewerManifest): # top-level Info.plist is as generated by CMake Info_plist = self.dst_path_of("Info.plist") + toplevel_MacOS = self.dst_path_of("MacOS") # the one file in top-level MacOS directory is the trampoline to # our nested launcher_app - if self.is_rearranging(): + if not self.is_rearranging(): + trampoline = "" + else: with self.prefix(dst="MacOS"): - toplevel_MacOS = self.get_dst_prefix() trampoline = self.put_in_file("""\ #!/bin/bash open "%s" --args "$@" |