Removed included level.

Mac App Bundle now starts only with added levels and a modified config file.

data/OpenRaider.init

@@ -34,7 +34,7 @@ DumpTexture=false
 #Music=tr4/039_TR4_Title_Q10.wav
 #Music=tr4/103_A3_Out_Night.wav
 #Music=tr4/108_A8_Coastal.wav
-Map=custom/Yvel.tr2
+#Map=custom/Yvel.tr2
 #Map=custom/villa2.phd
 #Map=custom/fenician1.phd
 #Map=custom/1984.tr2

mac_dist/OpenRaider.sh

@@ -1,19 +1,32 @@
 #!/bin/sh
 cd `dirname $0`
-if [ ! -d "~/.OpenRaider" ]; then
+if [ ! -d "${HOME}/.OpenRaider" ]; then
     echo "Setting up OpenRaider for user $USER..."
     mkdir -p ~/.OpenRaider
     cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
     cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
-    mkdir -p ~/.OpenRaider/paks/custom
+    mkdir -p ~/.OpenRaider/paks
     mkdir -p ~/.OpenRaider/music
     mkdir -p ~/.OpenRaider/data
     mkdir -p ~/.OpenRaider/sshots
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
     cp ../Resources/defaults/*.wav ~/.OpenRaider/data
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
-    cp ../Resources/defaults/*.tr2 ~/.OpenRaider/paks/custom
     echo "DONE"
     osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.init to your needs..."'
 fi
-./OpenRaider-bin
+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"'
+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-bin
+        fi
+    else
+        ./OpenRaider-bin
+    fi
+fi

setup.sh

@@ -6,12 +6,11 @@ echo "Setting up OpenRaider for user $USER..."
 mkdir -p ~/.OpenRaider
 cp data/OpenRaider.init ~/.OpenRaider/
 cp data/custom.cfg ~/.OpenRaider/
-mkdir -p ~/.OpenRaider/paks/custom
+mkdir -p ~/.OpenRaider/paks
 mkdir -p ~/.OpenRaider/music
 mkdir -p ~/.OpenRaider/data
 mkdir -p ~/.OpenRaider/sshots
 cp data/*.tga ~/.OpenRaider/data
 cp data/*.wav ~/.OpenRaider/data
 cp data/*.ttf ~/.OpenRaider/data
-cp data/*.tr2 ~/.OpenRaider/paks/custom
 echo "DONE"