Skip to content

Commit 07bab63

Browse files
Fix cache file after update, not before
1 parent 83c21f5 commit 07bab63

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

linuxdeploy-plugin-gtk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ case "$DEPLOY_GTK_VERSION" in
213213
gtk3_immodules_cache_file="$(dirname "$gtk3_immodulesdir")/immodules.cache"
214214
gtk3_immodules_query="$(search_tool "gtk-query-immodules-3.0" "libgtk-3-0")"
215215
copy_tree "$gtk3_libdir" "$APPDIR/"
216-
sed -i "s|$gtk3_libdir/||g" "$APPDIR/$gtk3_immodules_cache_file"
217216
cat >> "$HOOKFILE" <<EOF
218217
export GTK_EXE_PREFIX="\$APPDIR/$gtk3_exec_prefix"
219218
export GTK_PATH="\$APPDIR/$gtk3_path"
@@ -229,6 +228,7 @@ EOF
229228
if [ ! -f "$APPDIR/$gtk3_immodules_cache_file" ]; then
230229
echo "WARNING: immodules.cache file is missing"
231230
fi
231+
sed -i "s|$gtk3_libdir/||g" "$APPDIR/$gtk3_immodules_cache_file"
232232
;;
233233
4)
234234
echo "Installing GTK 4.0 modules"
@@ -255,7 +255,6 @@ gdk_pixbuf_moduledir="$(get_pkgconf_variable "gdk_pixbuf_moduledir" "gdk-pixbuf-
255255
# Note: gdk_pixbuf_query_loaders variable is not defined on some systems
256256
gdk_pixbuf_query="$(search_tool "gdk-pixbuf-query-loaders" "gdk-pixbuf-2.0")"
257257
copy_tree "$gdk_pixbuf_binarydir" "$APPDIR/"
258-
sed -i "s|$gdk_pixbuf_moduledir/||g" "$APPDIR/$gdk_pixbuf_cache_file"
259258
cat >> "$HOOKFILE" <<EOF
260259
export GDK_PIXBUF_MODULE_FILE="\$APPDIR/$gdk_pixbuf_cache_file"
261260
EOF
@@ -268,6 +267,7 @@ fi
268267
if [ ! -f "$APPDIR/$gdk_pixbuf_cache_file" ]; then
269268
echo "WARNING: loaders.cache file is missing"
270269
fi
270+
sed -i "s|$gdk_pixbuf_moduledir/||g" "$APPDIR/$gdk_pixbuf_cache_file"
271271

272272
echo "Copying more libraries"
273273
gobject_libdir="$(get_pkgconf_variable "libdir" "gobject-2.0")"

0 commit comments

Comments
 (0)