From b78e84097fab550f365d39ca715632c7b9abd379 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 7 Nov 2019 15:05:23 -0500 Subject: [PATCH] gdk-pixbuf setup hook: GDK_PIXBUF_MODULE_FILE might not be defined Also switch to [[ ... ]] because it is more robust w.r.t. empty arguments. --- pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index 5a7dcd7929969..8b6c80867a03a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -2,9 +2,9 @@ findGdkPixbufLoaders() { # choose the longest loaders.cache local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" - if [ -f "$loadersCache" ]; then - if [ -f "$GDK_PIXBUF_MODULE_FILE" ]; then - if [ $(cat "$loadersCache"|wc -l) -gt $(cat "$GDK_PIXBUF_MODULE_FILE"|wc -l) ]; then + if [[ -f "$loadersCache" ]]; then + if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then + if [[ "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" ]]; then export GDK_PIXBUF_MODULE_FILE="$loadersCache" fi else