summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-26 13:58:19 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-26 13:58:19 -0400
commitae6027572816c0f67d68b8759a00cc8848e21fec (patch)
tree66c692b0d57f0da1b9a4e416b3a3273896769e83 /indra
parent5f69db9d1907eac79ad7fa9e639733de42eec36f (diff)
SL-19242: Store Mac app bundle in tarball with top-level .app name.
We were creating the tarball with the app bundle stored as the whole 'Users/someone/.../newview/Release/Second Life Mumble.app' path. Don't.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 899456dd09..5039f3db83 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -933,7 +933,10 @@ class DarwinManifest(ViewerManifest):
tarpath = os.path.join(RUNNER_TEMP, "viewer.tar.bz2")
print(f'Creating {tarpath} from {self.get_dst_prefix()}')
with tarfile.open(tarpath, mode="w:bz2") as tarball:
- tarball.add(self.get_dst_prefix())
+ # store in the tarball as just 'Second Life Mumble.app'
+ # instead of 'Users/someone/.../newview/Release/Second...'
+ tarball.add(self.get_dst_prefix(),
+ arcname=os.path.basename(self.get_dst_prefix()))
self.set_github_output_path('viewer_app', tarpath)
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')