From 3ad6b91c4fca0f16b65251ea4184a3bc61da94dc Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 28 Feb 2022 00:21:45 +0100 Subject: [PATCH] Fix packaging fail in case system canot create a app image (not ubuntu) --- indra/newview/installers/linux/appimage.sh | 7 +++++++ indra/newview/viewer_manifest.py | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/newview/installers/linux/appimage.sh b/indra/newview/installers/linux/appimage.sh index 85dfda6284..b06a096fa1 100755 --- a/indra/newview/installers/linux/appimage.sh +++ b/indra/newview/installers/linux/appimage.sh @@ -3,6 +3,8 @@ SCRIPT_PATH=`readlink -f $0` SCRIPT_PATH=`dirname $SCRIPT_PATH` +echo "Trying to build AppImage in directory $1 into file $3" + # All hope is lost if there is no lsb_release command command -v lsb_release >/dev/null 2>/dev/null || exit 0 @@ -45,3 +47,8 @@ chmod a+x appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage --appimage-extract rm appimagetool-x86_64.AppImage ARCH=x86_64 squashfs-root/AppRun packaged + +if [ -f $2 ] +then + mv $2 $3 +fi diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 418761d576..e06acf3151 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -2053,8 +2053,10 @@ class LinuxManifest(ViewerManifest): # name in the tarfile realname = self.get_dst_prefix() tempname = self.build_path_of(installer_name) - self.run_command([self.args["source"] + "/installers/linux/appimage.sh", self.args["build"]] ) - self.run_command(["mv", self.args["build"] + "/Firestorm-x86_64.AppImage", self.args["build"] + "/" + installer_name + ".AppImage"]) + self.run_command([ + self.args["source"] + "/installers/linux/appimage.sh", self.args["build"], + self.args["build"] + "/Firestorm-x86_64.AppImage", self.args["build"] + "/" + installer_name + ".AppImage" + ] ) self.run_command(["mv", realname, tempname]) try: # only create tarball if it's a release build.