1 files changed, 27 insertions, 36 deletions
diff --git a/games/UrbanTerror/UrbanTerror.SlackBuild b/games/UrbanTerror/UrbanTerror.SlackBuild
index 5e8eeb5d5c..d1904b6dd1 100644
--- a/games/UrbanTerror/UrbanTerror.SlackBuild
+++ b/games/UrbanTerror/UrbanTerror.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for <UrbanTerror>
+# Slackware build script for UrbanTerror
 
 # Copyright 2011  Matthew "mfillpot" Fillpot
+# Copyright 2020 Alan Ianson Penticton, BC
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# urbanterror game is utilizing materials that are covered under the following
-# licenses:
-#  Quake 3 SDK license - the game engine source code is closed source
-#  GPL license - ioUrbanTerror uses the GPL license and its source code
-#   is openly available
-#
-# Full copies of all licenses will be installed in /usr/doc/urbanterror-$VERSION
-
 PRGNAM=UrbanTerror
-VERSION=${VERSION:-4.2.015}
+VERSION=${VERSION:-4.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,20 +41,11 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ZIP_VERS=$(echo $VERSION|cut -d '.' -f -2|tr -d ".")
-MIN_VERS=$(echo $VERSION|cut -d '.' -f 3-)
-
 LIBDIRSUFFIX=
-if [ "$ARCH" = "i586" ]; then
-  EXEC="i386"
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i386" ]; then
   EXEC="i386"
 elif [ "$ARCH" = "x86_64" ]; then
   EXEC="x86_64"
-  LIBDIRSUFFIX=64
-else
-  echo "Unrecognized architecture type! Check the script: $0"
-  exit 1
 fi
 
 CLIENT_EXEC=${CLIENT_EXEC:-Quake3-UrT.$EXEC}
@@ -71,34 +55,41 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-
+cd $TMP
+rm -rf $PRGNAM-$VERSION
 mkdir -p $PKG/usr/share
-unzip $CWD/${PRGNAM}${ZIP_VERS}_full${MIN_VERS}.zip -d $PKG/usr/share
-mv $PKG/usr/share/${PRGNAM}${ZIP_VERS} $PKG/usr/share/$PRGNAM
-
-# Make the current arch execs executable
-chmod 0755 $PKG/usr/share/$PRGNAM/$CLIENT_EXEC \
-  $PKG/usr/share/$PRGNAM/$SERVER_EXEC
+unzip $CWD/UrbanTerror434_full.zip -d $TMP/package-$PRGNAM/usr/share/games
+cd package-UrbanTerror/usr/share/games/UrbanTerror43
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Create symlinks in /usr/games
 mkdir -p $PKG/usr/games
 cd $PKG/usr/games
-  ln -sf /usr/share/$PRGNAM/$CLIENT_EXEC urbanterror
-  ln -sf /usr/share/$PRGNAM/$SERVER_EXEC urbanterror_server
+  ln -sf /usr/share/games/UrbanTerror43/$CLIENT_EXEC urbanterror
+  ln -sf /usr/share/games/UrbanTerror43/$SERVER_EXEC urbanterror_server
 cd -
 
 # Add a menu entry and icon
 mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/q3ut.png > $PKG/usr/share/pixmaps/q3ut.png
+cat $CWD/q3urt.png > $PKG/usr/share/pixmaps/q3urt.png
 
 # Remove unused files from the package
-( cd $PKG/usr/share/$PRGNAM
-  rm -f *.doc *.exe *.url *.dll *.reg \
-    q3ut4/*.doc q3ut4/*.exe q3ut4/*.url q3ut4/*.dll q3ut4/*.reg
-  rm -rf Quake3-UrT.app* UrTUpdater* )
-[ "$EXEC" != "i386" ] && rm -f $PKG/usr/share/$PRGNAM/*.i386
-[ "$EXEC" != "x86_64" ] && rm -f $PKG/usr/share/$PRGNAM/*.x86_64
+  cd $PKG/usr/share/games/UrbanTerror43
+  rm -f *.exe
+  rm -rf Quake3-UrT.app
+[ "$EXEC" != "i386" ] && rm -f *.i386
+[ "$EXEC" != "x86_64" ] && rm -f *.x86_64
+  cd q3ut4
+  rm *.cfg
+  rm *.txt
+  rm *.doc
+  chmod -x *.pk3
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 644 $CWD/docs/* $PKG/usr/doc/$PRGNAM-$VERSION/