mikekelly · December 30, 2023 18:10 · Dec 30, 2023 · Dec 30, 2023 · Dec 30, 2023 · Dec 30, 2023
diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -17,7 +17,7 @@ cd ioq3
 ./make-macosx.sh arm64
 
 cd build
-cp -R release-darwin-x86_64/ /Applications/ioquake3
+cp -R release-darwin-arm64/ /Applications/ioquake3
 
 cd /Applications/ioquake3/baseq3
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -14,7 +14,7 @@ cd $HOME
 git clone https://github.com/ioquake/ioq3
 cd ioq3
 
-./make-macosx.sh x86_64
+./make-macosx.sh arm64
 
 cd build
 cp -R release-darwin-x86_64/ /Applications/ioquake3

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -42,7 +42,7 @@ rm -f cpma.zip
 echo "Quake 3: Arena installation successful!"
 
 echo "Performing cleanup"
-rm -R $HOME/ioq3
+rm -Rf $HOME/ioq3
 
 read -p "Do you want to start the game now? (y/n) " -n 1 -r
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -36,7 +36,6 @@ rm -f cpma-mappack-full.zip
 # CPMA MOD binaries
 cd ..
 curl https://cdn.playmorepromode.com/files/cpma/cpma-1.53-nomaps.zip >cpma.zip
-
 unzip -a cpma.zip
 rm -f cpma.zip
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -35,7 +35,8 @@ rm -f cpma-mappack-full.zip
 
 # CPMA MOD binaries
 cd ..
-curl https://cdn.playmorepromode.com/files/latest/cpma-1.50-nomaps.zip >cpma.zip
+curl https://cdn.playmorepromode.com/files/cpma/cpma-1.53-nomaps.zip >cpma.zip
+
 unzip -a cpma.zip
 rm -f cpma.zip
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -37,15 +37,12 @@ rm -f cpma-mappack-full.zip
 cd ..
 curl https://cdn.playmorepromode.com/files/latest/cpma-1.50-nomaps.zip >cpma.zip
 unzip -a cpma.zip
-
-echo "Performing cleanup"
-rm -f baseq3/cpma-mappack-full.zip
 rm -f cpma.zip
-rm -R $HOME/ioq3
 
 echo "Quake 3: Arena installation successful!"
 
-# rm -R $HOME/ioq3
+echo "Performing cleanup"
+rm -R $HOME/ioq3
 
 read -p "Do you want to start the game now? (y/n) " -n 1 -r
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -23,7 +23,7 @@ cd /Applications/ioquake3/baseq3
 
 COUNT=0
 while [ $COUNT -lt 9 ]; do
-    curl https://github.com/nrempel/q3-server/raw/master/baseq3/pak$COUNT.pk3 > pak$COUNT.pk3
+    curl https://raw.githubusercontent.com/nrempel/q3-server/master/baseq3/pak$COUNT.pk3 > pak$COUNT.pk3
     let COUNT+=1
 done
 
@@ -44,3 +44,14 @@ rm -f cpma.zip
 rm -R $HOME/ioq3
 
 echo "Quake 3: Arena installation successful!"
+
+# rm -R $HOME/ioq3
+
+read -p "Do you want to start the game now? (y/n) " -n 1 -r
+
+if [[ ! $REPLY =~ ^[Yy]$ ]]
+then
+    exit 0
+else
+    open /Applications/ioquake3/ioquake3.app
+fi
diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -23,13 +23,13 @@ cd /Applications/ioquake3/baseq3
 
 COUNT=0
 while [ $COUNT -lt 9 ]; do
-    curl http://files.anitalink.com/gamecache/quake3/baseq3/pak$COUNT.pk3 > pak$COUNT.pk3
+    curl https://github.com/nrempel/q3-server/raw/master/baseq3/pak$COUNT.pk3 > pak$COUNT.pk3
     let COUNT+=1
 done
 
 echo "Installing CPMA mod..."
 # CPMA map pack
-curl -L http://playmorepromode.com/files/cpma-mappack-full.zip >cpma-mappack-full.zip
+curl -L https://cdn.playmorepromode.com/files/cpma-mappack-full.zip >cpma-mappack-full.zip
 unzip -a -d . cpma-mappack-full.zip
 rm -f cpma-mappack-full.zip
 

diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -38,13 +38,9 @@ cd ..
 curl https://cdn.playmorepromode.com/files/latest/cpma-1.50-nomaps.zip >cpma.zip
 unzip -a cpma.zip
 
-curl https://cdn.playmorepromode.com/files/latest/cnq3-1.50.zip >cnq3.zip
-unzip -a cnq3.zip
-
 echo "Performing cleanup"
 rm -f baseq3/cpma-mappack-full.zip
 rm -f cpma.zip
-rm -f cnq3.zip
 rm -R $HOME/ioq3
 
 echo "Quake 3: Arena installation successful!"
diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -35,12 +35,16 @@ rm -f cpma-mappack-full.zip
 
 # CPMA MOD binaries
 cd ..
-curl -L http://playmorepromode.com/files/latest/cpma >cpma.zip
+curl https://cdn.playmorepromode.com/files/latest/cpma-1.50-nomaps.zip >cpma.zip
 unzip -a cpma.zip
 
+curl https://cdn.playmorepromode.com/files/latest/cnq3-1.50.zip >cnq3.zip
+unzip -a cnq3.zip
+
 echo "Performing cleanup"
 rm -f baseq3/cpma-mappack-full.zip
 rm -f cpma.zip
+rm -f cnq3.zip
 rm -R $HOME/ioq3
 
 echo "Quake 3: Arena installation successful!"
diff --git a/install-quake3+cpma.sh b/install-quake3+cpma.sh
@@ -38,15 +38,9 @@ cd ..
 curl -L http://playmorepromode.com/files/latest/cpma >cpma.zip
 unzip -a cpma.zip
 
-echo "Quake 3: Arena installation successful!"
-
+echo "Performing cleanup"
+rm -f baseq3/cpma-mappack-full.zip
+rm -f cpma.zip
 rm -R $HOME/ioq3
 
-read -p "Do you want to start the game now? (y/n) " -n 1 -r
-
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
-    exit 0
-else
-    open /Applications/ioquake3/ioquake3.app
-fi
+echo "Quake 3: Arena installation successful!"
diff --git a/install-quake3.sh → install-quake3+cpma.sh b/install-quake3.sh → install-quake3+cpma.sh
@@ -27,6 +27,17 @@ while [ $COUNT -lt 9 ]; do
     let COUNT+=1
 done
 
+echo "Installing CPMA mod..."
+# CPMA map pack
+curl -L http://playmorepromode.com/files/cpma-mappack-full.zip >cpma-mappack-full.zip
+unzip -a -d . cpma-mappack-full.zip
+rm -f cpma-mappack-full.zip
+
+# CPMA MOD binaries
+cd ..
+curl -L http://playmorepromode.com/files/latest/cpma >cpma.zip
+unzip -a cpma.zip
+
 echo "Quake 3: Arena installation successful!"
 
 rm -R $HOME/ioq3

diff --git a/install-quake3.sh b/install-quake3.sh
@@ -31,10 +31,8 @@ echo "Quake 3: Arena installation successful!"
 
 rm -R $HOME/ioq3
 
-cd
-
 read -p "Do you want to start the game now? (y/n) " -n 1 -r
-echo
+
 if [[ ! $REPLY =~ ^[Yy]$ ]]
 then
     exit 0

diff --git a/install-quake3.sh b/install-quake3.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Install Quake 3: Arena on a mac
+
+# Copyright (c) 2016 simonewebdesign
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+set -e # exit on error
+
+cd $HOME
+
+git clone https://github.com/ioquake/ioq3
+cd ioq3
+
+./make-macosx.sh x86_64
+
+cd build
+cp -R release-darwin-x86_64/ /Applications/ioquake3
+
+cd /Applications/ioquake3/baseq3
+
+COUNT=0
+while [ $COUNT -lt 9 ]; do
+    curl http://files.anitalink.com/gamecache/quake3/baseq3/pak$COUNT.pk3 > pak$COUNT.pk3
+    let COUNT+=1
+done
+
+echo "Quake 3: Arena installation successful!"
+
+rm -R $HOME/ioq3
+
+cd
+
+read -p "Do you want to start the game now? (y/n) " -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]
+then
+    exit 0
+else
+    open /Applications/ioquake3/ioquake3.app
+fi