X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=install-dylibs.sh;h=6b9e5303af8aef09050019dc27c5fb7d86fe4d89;hp=fd70339a2050f2823f6a7d3747db60289d9d3367;hb=refs%2Fheads%2FMario%2Ftexturebrowser_fix;hpb=7dd945e36a13a7659bb14a2484e0ad5698280884

diff --git a/install-dylibs.sh b/install-dylibs.sh
old mode 100644
new mode 100755
index fd70339a..6b9e5303
--- a/install-dylibs.sh
+++ b/install-dylibs.sh
@@ -24,30 +24,27 @@ 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=$LIB
-done
-cp -L "$LAST" "$INSTALLDIR"
-finkgetdeps "$LAST"
-
-for LIB in "$MACLIBDIR"/pango/*/modules/pango-basic-fc.so; do
-	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"
+}
 
-for LIB in "$MACLIBDIR"/pango/*/modules/pango-basic-x.so; do
-	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"
-cp -L "$MACLIBDIR"/../etc/gtk-2.0/gdk-pixbuf.loaders "$INSTALLDIR"
-cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR"
+#cp -L "$MACLIBDIR"/../etc/fonts/fonts.conf "$INSTALLDIR"
+#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 +62,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"
+