Skip to content

Commit 1f3438e

Browse files
committed
create-appimage.sh: generalize includes
(includes here are the exceptions from upstream/AppImage excludelist)
1 parent b9ce913 commit 1f3438e

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

data/scripts/Linux-AppImage/create-appimage.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,19 @@ while read -r x; do
143143
NAME=$(echo "$x" | awk '{ print $1 }')
144144
EXCLUDE_LIST="$EXCLUDE_LIST $NAME"
145145
done < excludelist
146+
# these dependencies will be preloaded by AppRun if found in system - include
147+
# them for the cases when isn't
148+
should_be_included() {
149+
INCLUDE_LIST="\
150+
libOpenGL.so.0\
151+
libjack.so.0\
152+
libpipewire-0.3.so.0\
153+
"
154+
echo "$INCLUDE_LIST" |
155+
grep -E -q '(^|[^[:alnum:]_])'"${1?}"'([^[:alnum:]_]|$)'
156+
}
146157
for n in $EXCLUDE_LIST; do
147-
# these dependencies preloaded by AppRun if found in system - include
148-
# them for the cases when isn't
149-
if [ "$n" = libjack.so.0 ] || [ "$n" = libpipewire-0.3.so.0 ]; then
150-
continue
151-
fi
152-
# not included in U25.10 live
153-
if [ "$n" = libOpenGL.so.0 ]; then
158+
if should_be_included "$n"; then
154159
continue
155160
fi
156161
if [ -f "$APPPREFIX/lib/$n" ]; then

0 commit comments

Comments
 (0)