Fixed Mac Bundle setup script and its permissions

xythobuz · Mar 12, 2014 · cc9bb0d · cc9bb0d
1 parent 2e9c185
commit cc9bb0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/cmake/setup_mac.sh b/cmake/setup_mac.sh
@@ -17,16 +17,7 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
 fi
 if [[ ! -n `find "${HOME}/.OpenRaider/paks" -type f -exec echo Found {} \;` ]]; then
     echo "Missing level files!"
-    osascript -e 'tell app "System Events" to display alert "No level files stored in ~/.OpenRaider/paks\n\nPlace level files there and edit ~/.OpenRaider/OpenRaider.init"'
+    osascript -e 'tell app "System Events" to display alert "No level files stored in ~/.OpenRaider/paks\n\nPlace original Tomb Raider level files there!"'
 else
-    if [[ ! `diff "${HOME}/.OpenRaider/OpenRaider.init" "../Resources/defaults/OpenRaider.init"` ]]; then
-        if [[ ! `diff "${HOME}/.OpenRaider/custom.cfg" "../Resources/defaults/custom.cfg"` ]]; then
-            echo "Unconfigured user!"
-            osascript -e 'tell app "System Events" to display alert "Please edit ~/.OpenRaider/OpenRaider.init or ~/.OpenRaider/custom.cfg"'
-        else
-            ./OpenRaider
-        fi
-    else
-        ./OpenRaider
-    fi
+    ./OpenRaider
 fi
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -96,6 +96,7 @@ if (APPLE)
         add_custom_command (TARGET OpenRaider POST_BUILD
             COMMAND echo "Injecting setup script..."
             COMMAND cp "${PROJECT_SOURCE_DIR}/cmake/setup_mac.sh" "${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents/MacOS/OpenRaider.sh"
+            COMMAND chmod "a+x" "${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents/MacOS/OpenRaider.sh"
         )
 
         # Fix executable name, so setup script will be called

diff --git a/src/OpenRaider.cpp b/src/OpenRaider.cpp
@@ -485,7 +485,7 @@ void OpenRaider::handleConsoleKeyPressEvent(unsigned int key,unsigned int mod)
                 buffer[2] = 0;
                 break;
             default:
-                // Workaround until proper SDL2 text input is used
+                //! \fixme Workaround until proper SDL2 text input is used
                 if ((key >= 1073742049) && (key <= 1073742051))
                     break;
 
@@ -2698,7 +2698,6 @@ void OpenRaider::processRoom(int index)
     //fflush(stdout);
 }
 
-//! \fixme Use rc_get_bool consistently!
 void OpenRaider::consoleCommand(char *cmd)
 {
     bool b = false;