Skip to content

Some fixes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 26, 2021
Merged

Some fixes #13

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8365b9d
Remove LD_LIBRARY_PATH export
TheTumultuousUnicornOfDarkness Jan 24, 2021
3705744
Fix search_tool function
TheTumultuousUnicornOfDarkness Jan 24, 2021
ba49aab
Use uppercase word for warning messages
TheTumultuousUnicornOfDarkness Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions linuxdeploy-plugin-gtk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ search_tool() {
local tool="$1"
local directory="$2"

if command -v "$tool" > /dev/null; then
echo "$tool"
if command -v "$tool"; then
return 0
fi

Expand All @@ -48,9 +47,6 @@ search_tool() {
return 0
fi
done

echo "$0: $tool not found, aborting" > /dev/stderr
{ exit 1; }
}

APPDIR=
Expand Down Expand Up @@ -151,10 +147,10 @@ if [ -x "$gtk3_immodules_query" ]; then
echo "Updating immodules cache in $APPDIR/$gtk3_immodules_cache_file"
"$gtk3_immodules_query" > "$APPDIR/$gtk3_immodules_cache_file"
else
echo "Warning: gtk-query-immodules-3.0 not found"
echo "WARNING: gtk-query-immodules-3.0 not found"
fi
if [ ! -f "$APPDIR/$gtk3_immodules_cache_file" ]; then
echo "Warning: immodules.cache file is missing"
echo "WARNING: immodules.cache file is missing"
fi

echo "Installing GDK PixBufs"
Expand All @@ -168,17 +164,16 @@ copy_tree "$gdk_pixbuf_binarydir" "$APPDIR/"
cat >> "$HOOKFILE" <<EOF
export GDK_PIXBUF_MODULEDIR="\$APPDIR/$gdk_pixbuf_moduledir"
export GDK_PIXBUF_MODULE_FILE="\$CACHEDIR/loaders.cache"
export LD_LIBRARY_PATH="\$GDK_PIXBUF_MODULEDIR:\$LD_LIBRARY_PATH"
sed "s|$gdk_pixbuf_moduledir|\$APPDIR/$gdk_pixbuf_moduledir|g" "\$APPDIR/$gdk_pixbuf_cache_file" > "\$GDK_PIXBUF_MODULE_FILE"
EOF
if [ -x "$gdk_pixbuf_query" ]; then
echo "Updating pixbuf cache in $APPDIR/$gdk_pixbuf_cache_file"
"$gdk_pixbuf_query" > "$APPDIR/$gdk_pixbuf_cache_file"
else
echo "Warning: gdk-pixbuf-query-loaders not found"
echo "WARNING: gdk-pixbuf-query-loaders not found"
fi
if [ ! -f "$APPDIR/$gdk_pixbuf_cache_file" ]; then
echo "Warning: loaders.cache file is missing"
echo "WARNING: loaders.cache file is missing"
fi

echo "Copying more libraries"
Expand Down