macos: rename radiant to netradiant

diff --git a/setup/apple/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist
index 75796b16f9754d4c73cc9a4dd1560c9d8189e74d..2b34323e2207e48fd7ab0aab66300f7acbb91db8 100644 (file)
--- a/setup/apple/NetRadiant.app/Contents/Info.plist
+++ b/setup/apple/NetRadiant.app/Contents/Info.plist
@@ -7,9 +7,9 @@
         <key>CFBundleDisplayName</key>
         <string>NetRadiant</string>
         <key>CFBundleExecutable</key>
-        <string>radiant</string>
+        <string>netradiant</string>
         <key>CFBundleIconFile</key>
-        <string>radiant.icns</string>
+        <string>netradiant.icns</string>
         <key>CFBundleIdentifier</key>
         <string>org.xonotic.netradiant</string>
         <key>CFBundleName</key>

diff --git a/setup/apple/NetRadiant.app/Contents/MacOS/netradiant b/setup/apple/NetRadiant.app/Contents/MacOS/netradiant
new file mode 100755 (executable)
index 0000000..701a7fe
--- /dev/null
+++ b/setup/apple/NetRadiant.app/Contents/MacOS/netradiant
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RADIANT_HOME=$(dirname "$0")
+RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app}
+
+echo
+echo "Starting NetRadiant in ${RADIANT_HOME}"
+echo
+
+set -x
+
+resources="${RADIANT_HOME}/Contents/Resources"
+
+export FONTCONFIG_PATH="${resources}/etc/fonts"
+export FC_DEBUG=1024
+
+export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
+export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
+
+export GDK_PATH="${resources}"
+export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
+
+export GOBJECT_PATH="${resources}"
+
+export GTK_DATA_PREFIX="${resources}"
+export GTK_EXE_PREFIX="${resources}"
+export GTK_PATH="${resources}"
+
+export PANGO_SYSCONFDIR="${resources}/etc"
+export PANGO_LIBDIR="${resources}/lib"
+
+cd "${resources}/install"
+./radiant &
+
+set +x
\ No newline at end of file

diff --git a/setup/apple/NetRadiant.app/Contents/MacOS/radiant b/setup/apple/NetRadiant.app/Contents/MacOS/radiant
deleted file mode 100755 (executable)
index 701a7fe..0000000
--- a/setup/apple/NetRadiant.app/Contents/MacOS/radiant
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-RADIANT_HOME=$(dirname "$0")
-RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app}
-
-echo
-echo "Starting NetRadiant in ${RADIANT_HOME}"
-echo
-
-set -x
-
-resources="${RADIANT_HOME}/Contents/Resources"
-
-export FONTCONFIG_PATH="${resources}/etc/fonts"
-export FC_DEBUG=1024
-
-export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
-export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
-
-export GDK_PATH="${resources}"
-export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
-
-export GOBJECT_PATH="${resources}"
-
-export GTK_DATA_PREFIX="${resources}"
-export GTK_EXE_PREFIX="${resources}"
-export GTK_PATH="${resources}"
-
-export PANGO_SYSCONFDIR="${resources}/etc"
-export PANGO_LIBDIR="${resources}/lib"
-
-cd "${resources}/install"
-./radiant &
-
-set +x
\ No newline at end of file

diff --git a/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns
new file mode 100644 (file)
index 0000000..339e718
Binary files /dev/null and b/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns differ

diff --git a/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns
deleted file mode 100644 (file)
index 339e718..0000000
Binary files a/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns and /dev/null differ