Skip to content

Commit ded9ecd

Browse files
committed
Keep AppImage build script arch agnostic
1 parent 7df59c6 commit ded9ecd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/appimage-build-script.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ cp -a /var/lib/lensfun-updates/* ../AppDir/usr/share/lensfun
5252
# environment variable in AppRun.wrapped accordingly when starting
5353
# AppImage so that libgphoto2 can find these drivers.
5454
mkdir -p ../AppDir/usr/lib/libgphoto2
55-
cp -a /usr/lib/x86_64-linux-gnu/libgphoto2/* ../AppDir/usr/lib/libgphoto2
55+
ARCH=$(uname -m)
56+
cp -a /usr/lib/$ARCH-linux-gnu/libgphoto2/* ../AppDir/usr/lib/libgphoto2
5657

5758
# Include gphoto2 port libraries. We also have to set the IOLIBS
5859
# environment variable in AppRun.wrapped accordingly when starting
5960
# AppImage so that libgphoto2 can find these drivers.
6061
mkdir -p ../AppDir/usr/lib/libgphoto2_port
61-
cp -a /usr/lib/x86_64-linux-gnu/libgphoto2_port/* ../AppDir/usr/lib/libgphoto2_port
62+
cp -a /usr/lib/$ARCH-linux-gnu/libgphoto2_port/* ../AppDir/usr/lib/libgphoto2_port
6263

6364
# Include networking related GIO modules. We also have to set the GIO_EXTRA_MODULES
6465
# environment variable in AppRun.wrapped accordingly when starting AppImage
@@ -67,14 +68,13 @@ cp -a /usr/lib/x86_64-linux-gnu/libgphoto2_port/* ../AppDir/usr/lib/libgphoto2_p
6768
# may be incompatibility issues with different versions of glib in the bundle and
6869
# on the host system, see https://github.com/darktable-org/darktable/issues/19266
6970
mkdir -p ../AppDir/usr/lib/gio
70-
cp -a /usr/lib/x86_64-linux-gnu/gio/* ../AppDir/usr/lib/gio
71+
cp -a /usr/lib/$ARCH-linux-gnu/gio/* ../AppDir/usr/lib/gio
7172

7273
# Since linuxdeploy is itself an AppImage, we don't rely on it being installed
7374
# on the build system, but download it every time we run this script. If that
7475
# doesn't suit you (for example, you want to build an AppImage without an
7576
# Internet connection), you can edit this script accordingly, and call
7677
# linuxdeploy and its plugin from where you put them.
77-
ARCH=$(uname -m)
7878
wget -c --no-verbose "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$ARCH.AppImage"
7979
wget -c --no-verbose "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
8080

0 commit comments

Comments
 (0)