From 9cf3816f69fa05dec5ed5c19f872583b3b1107c9 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 23 Jan 2012 20:19:45 +0100 Subject: [PATCH] simplify code --- install-dylibs.sh | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/install-dylibs.sh b/install-dylibs.sh index 9f4e3e2b..1554b49c 100755 --- a/install-dylibs.sh +++ b/install-dylibs.sh @@ -24,29 +24,20 @@ finkgetdeps() finkgetdeps "$INSTALLDIR/radiant.$EXE" echo Warning: this only works if only ONE version of gtk-2.0 and pango is installed -LAST= -for LIB in "$MACLIBDIR"/gtk-2.0/*/loaders/libpixbufloader-bmp.so "$MACLIBDIR"/gdk-pixbuf-2.0/*/loaders/libpixbufloader-bmp.so; do - [ -f "$LIB" ] || continue - LAST=$LIB -done -cp -L "$LAST" "$INSTALLDIR" -finkgetdeps "$LAST" - -LAST= -for LIB in "$MACLIBDIR"/pango/*/modules/pango-basic-fc.so; do - [ -f "$LIB" ] || continue - LAST=$LIB -done -cp -L "$LAST" "$INSTALLDIR" -finkgetdeps "$LAST" +getlib() +{ + LAST= + for LIB in "$@"; do + [ -f "$LIB" ] || continue + LAST=$LIB + done + cp -L "$LAST" "$INSTALLDIR" + finkgetdeps "$LAST" +} -LAST= -for LIB in "$MACLIBDIR"/pango/*/modules/pango-basic-x.so; do - [ -f "$LIB" ] || continue - LAST=$LIB -done -cp -L "$LAST" "$INSTALLDIR" -finkgetdeps "$LAST" +getlib "$MACLIBDIR"/gtk-2.0/*/loaders/libpixbufloader-bmp.so "$MACLIBDIR"/gdk-pixbuf-2.0/*/loaders/libpixbufloader-bmp.so +getlib "$MACLIBDIR"/pango/*/modules/pango-basic-fc.so +getlib "$MACLIBDIR"/pango/*/modules/pango-basic-x.so cp -L "$MACLIBDIR"/../etc/fonts/fonts.conf "$INSTALLDIR" cp -L "$MACLIBDIR"/../etc/fonts/fonts.dtd "$INSTALLDIR" -- 2.39.2