diff options
Diffstat (limited to 'pkgs/build-support/setup-hooks/wrap-gapps-hook.sh')
-rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 717740f1f20..906b1db9d10 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -1,19 +1,12 @@ -# shellcheck shell=bash gappsWrapperArgs=() find_gio_modules() { - if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then + if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules") fi } -addEnvHooks "${targetOffset:?}" find_gio_modules - -wrapGApp() { - local program="$1" - shift 1 - wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@" -} +addEnvHooks "$targetOffset" find_gio_modules # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. wrapGAppsHook() { @@ -33,19 +26,20 @@ wrapGAppsHook() { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH") fi - if [ -d "${prefix:?}/share" ]; then + if [ -d "$prefix/share" ]; then gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") fi - if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then + if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules") fi - for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do - gappsWrapperArgs+=(--prefix "$v" : "${!v}") + 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 + if [[ -z "$dontWrapGApps" ]]; then targetDirsThatExist=() targetDirsRealPath=() @@ -58,7 +52,7 @@ wrapGAppsHook() { find "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do echo "Wrapping program '${file}'" - wrapGApp "${file}" + wrapProgram "${file}" "${gappsWrapperArgs[@]}" done fi done @@ -77,7 +71,7 @@ wrapGAppsHook() { fi done echo "Wrapping link: '$linkPath'" - wrapGApp "${linkPath}" + wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}" done fi fi |