fix icon
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 4 Mar 2009 09:03:25 +0000 (09:03 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 4 Mar 2009 09:03:25 +0000 (09:03 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@205 61c419a2-8eb2-4b30-bcec-8cead039b335

install-dylibs.sh
setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh

index 12d0bbb..107e477 100644 (file)
@@ -9,14 +9,30 @@ set -ex
 finkgetdeps()
 {
        otool -L "$1" | grep /sw/lib | while read -r LIB STUFF; do
+               [ -z "${LIB##*:}" ] && continue # first line
                [ -f "$INSTALLDIR/${LIB##*/}" ] && continue
                cp -vL "$LIB" "$INSTALLDIR"
-               finkgetdeps "$INSTALLDIR/${LIB##*/}"
+               finkgetdeps "$LIB"
        done
 }
 
 finkgetdeps "$INSTALLDIR/radiant.ppc"
 echo Warning: this only works if only ONE version of gtk-2.0 and pango is installed
-cp -vL /sw/lib/gtk-2.0/*/loaders/libpixbufloader-bmp.so "$INSTALLDIR/"
-cp -vL /sw/lib/pango/*/modules/pango-basic-fc.so "$INSTALLDIR/"
-cp -vL /sw/lib/pango/*/modules/pango-basic-x.so "$INSTALLDIR/"
+
+for LIB in /sw/lib/gtk-2.0/*/loaders/libpixbufloader-bmp.so; do
+       LAST=$LIB
+done
+cp -L "$LAST" "$INSTALLDIR"
+finkgetdeps "$LAST"
+
+for LIB in /sw/lib/pango/*/modules/pango-basic-fc.so; do
+       LAST=$LIB
+done
+cp -L "$LAST" "$INSTALLDIR"
+finkgetdeps "$LAST"
+
+for LIB in /sw/lib/pango/*/modules/pango-basic-x.so; do
+       LAST=$LIB
+done
+cp -L "$LAST" "$INSTALLDIR"
+finkgetdeps "$LAST"
index 20e1a67..80e91bd 100755 (executable)
@@ -35,7 +35,7 @@ case "$NEX_DIRECTORY" in
 esac
 
 if [ -x /usr/bin/open-x11 ]; then
-       exec /usr/bin/open-x11 ./radiant.ppc "$@"
+       /usr/bin/open-x11 ./radiant.ppc "$@" &
 else
-       exec ./radiant.ppc "$@"
+       ./radiant.ppc "$@" &
 fi