ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

wrap-gapps-hook.sh: fix double inclusion guard

Browse Source 
The simple "return" would not override the non-zero error code set by the
preceding test command, therefore aborting scripts running with "set -e".
This commit is contained in:
Peter Simons 2016-03-17 20:57:46 +01:00
parent fb1f18b98c
commit af81505c00
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View File

@ -11,7 +11,7 @@ envHooks+=(find_gio_modules)
# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
wrapGAppsHook() { wrapGAppsHook() {
# guard against running multiple times (e.g. due to propagation) # guard against running multiple times (e.g. due to propagation)
[ -z "$wrapGAppsHookHasRun" ] || return [ -z "$wrapGAppsHookHasRun" ] || return 0
wrapGAppsHookHasRun=1 wrapGAppsHookHasRun=1
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then