From 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 Mon Sep 17 00:00:00 2001 From: Taahir Ahmed Date: Sat, 15 Apr 2017 21:50:13 -0500 Subject: wrapGAppsHook: Correct `wrapProgram` invocations 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. --- pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 3cad1838d260..5d1cce6ee049 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -36,9 +36,10 @@ wrapGAppsHook() { done if [ -z "$dontWrapGApps" ]; then - for i in $prefix/bin/* $prefix/libexec/*; do - echo "Wrapping app $i" - wrapProgram "$i" "${gappsWrapperArgs[@]}" + find "${prefix}/bin" "${prefix}/libexec" -type f -executable -print0 \ + | while IFS= read -r -d '' file; do + echo "Wrapping program $file" + wrapProgram "$file" "${gappsWrapperArgs[@]}" done fi } -- cgit 1.4.1