X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=install-dylibs.sh;h=9f4e3e2b9a349b64c9915073b3dcf49c1cd7b8e8;hb=f4e45cb8976243b4ab56234e72e73d0e2e02a254;hp=fd70339a2050f2823f6a7d3747db60289d9d3367;hpb=7dd945e36a13a7659bb14a2484e0ad5698280884;p=xonotic%2Fnetradiant.git

diff --git a/install-dylibs.sh b/install-dylibs.sh
old mode 100644
new mode 100755
index fd70339a..9f4e3e2b
--- a/install-dylibs.sh
+++ b/install-dylibs.sh
@@ -24,19 +24,25 @@ finkgetdeps()
 finkgetdeps "$INSTALLDIR/radiant.$EXE"
 echo Warning: this only works if only ONE version of gtk-2.0 and pango is installed
 
-for LIB in "$MACLIBDIR"/gtk-2.0/*/loaders/libpixbufloader-bmp.so; do
+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"
 
+LAST=
 for LIB in "$MACLIBDIR"/pango/*/modules/pango-basic-x.so; do
+	[ -f "$LIB" ] || continue
 	LAST=$LIB
 done
 cp -L "$LAST" "$INSTALLDIR"
@@ -47,7 +53,7 @@ cp -L "$MACLIBDIR"/../etc/fonts/fonts.dtd "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/gtk-2.0/gdk-pixbuf.loaders "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR"
 
-$CAT > $INSTALLDIR/../netradiant.sh <<EOF
+$CAT > "$INSTALLDIR/../netradiant.sh" <<EOF
 #!/bin/sh
 
 MY_DIRECTORY="\${0%/*}" # cut off the script name
@@ -65,5 +71,7 @@ if [ -x /usr/bin/open-x11 ]; then
 else
 	env LC_ALL="en_US.UTF-8" ./radiant.$EXE "$@" &
 fi
-
 EOF
+
+chmod 755 "$INSTALLDIR/../netradiant.sh"
+