2cd342cfb3
This change fixes several defects in the way `wrapGAppsHook` selected the executable to wrap. Previously, it would wrap any top-level files in the target `/bin` and `/libexec` directories, including directories and non-executable files. In addition, it failed to wrap files in subdirectories. Now, it uses `find` to iterate over these directory hierarchies, selecting only executable files for wrapping.
52 lines
1.5 KiB
Bash
52 lines
1.5 KiB
Bash
gappsWrapperArgs=()
|
|
|
|
find_gio_modules() {
|
|
if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
|
|
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
|
|
fi
|
|
}
|
|
|
|
envHooks+=(find_gio_modules)
|
|
|
|
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
|
|
wrapGAppsHook() {
|
|
# guard against running multiple times (e.g. due to propagation)
|
|
[ -z "$wrapGAppsHookHasRun" ] || return 0
|
|
wrapGAppsHookHasRun=1
|
|
|
|
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
|
|
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
|
|
fi
|
|
|
|
if [ -n "$XDG_ICON_DIRS" ]; then
|
|
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS")
|
|
fi
|
|
|
|
if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then
|
|
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
|
|
fi
|
|
|
|
if [ -d "$prefix/share" ]; then
|
|
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
|
|
fi
|
|
|
|
for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
|
|
eval local dummy="\$$v"
|
|
gappsWrapperArgs+=(--prefix $v : "$dummy")
|
|
done
|
|
|
|
if [[ -z "$dontWrapGApps" ]]; then
|
|
targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
|
|
for targetDir in "${targetDirs[@]}"; do
|
|
if [[ -d "${targetDir}" ]]; then
|
|
find "${targetDir}" -type f -executable -print0 \
|
|
| while IFS= read -r -d '' file; do
|
|
echo "Wrapping program ${file}"
|
|
wrapProgram "${file}" "${gappsWrapperArgs[@]}"
|
|
done
|
|
fi
|
|
done
|
|
fi
|
|
}
|
|
|
|
fixupOutputHooks+=(wrapGAppsHook)
|