games/typhoon_2001: Put exe in /usr/games.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 32 insertions, 23 deletions

diff --git a/games/typhoon_2001/README b/games/typhoon_2001/README
index ffe5928951..18d5bcc347 100644
--- a/games/typhoon_2001/README
+++ b/games/typhoon_2001/README
@@ -1,10 +1,12 @@
+typhoon_2001 (a freeware game)
+
 Typhoon 2001 is a freeware game inspired by both the Atari Jaguar hit
 game Tempest 2000 and the arcade hit Tempest. It takes ideas and concepts
 from both games, but rearranges and changes them. A few new ideas have
 been implemented as well.
 
 To run the Linux version of Typhoon 2001, you will need hardware OpenGL
-video accleration support for your X server.
+video acceleration support for your X server.
 
 This game is not open source: it's distributed binary-only. The SlackBuild
 simply installs the binary distribution files in the appropriate places,
diff --git a/games/typhoon_2001/doinst.sh b/games/typhoon_2001/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/typhoon_2001/doinst.sh
+++ b/games/typhoon_2001/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/typhoon_2001/slack-desc b/games/typhoon_2001/slack-desc
index cc36052310..9f0fa3a547 100644
--- a/games/typhoon_2001/slack-desc
+++ b/games/typhoon_2001/slack-desc
@@ -14,6 +14,6 @@ typhoon_2001: and concepts from both games, but rearranges and changes them. A
 typhoon_2001: few new ideas have been implemented as well.
 typhoon_2001:
 typhoon_2001: To run the Linux version of Typhoon 2001, you will need hardware
-typhoon_2001: OpenGL video accleration support for your X server.
+typhoon_2001: OpenGL video acceleration support for your X server.
 typhoon_2001:
 typhoon_2001: Homepage: http://typhoon.kuto.de/
diff --git a/games/typhoon_2001/typhoon_2001.SlackBuild b/games/typhoon_2001/typhoon_2001.SlackBuild
index 00961e63eb..3807ca82bc 100644
--- a/games/typhoon_2001/typhoon_2001.SlackBuild
+++ b/games/typhoon_2001/typhoon_2001.SlackBuild
@@ -11,11 +11,16 @@
 # typhoon.cfg needs to be a real file and be writable by the user.
 # (it will be created the first time the game is run).
 
+# 20211012 bkw: BUILD=2
+# - binary in /usr/games.
+# - new-style icons.
+# - fix typo in README and slack-desc.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=typhoon_2001
 VERSION=${VERSION:-r3992}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -24,9 +29,6 @@ PKGTYPE=${PKGTYPE:-tgz}
 # so the check is gone and the ARCH is hardcoded.
 ARCH=i586
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -49,32 +51,31 @@ tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
 
 # Don't trust the ownership/permissions...
 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 chmod 755 typhoon
 
 # OK, put everything where it goes in a proper Slack package...
 mkdir -p $PKG/usr/share/games/$PRGNAM \
-			$PKG/usr/libexec \
-			$PKG/usr/doc/$PRGNAM-$VERSION \
-			$PKG/install \
-			$PKG/usr/bin
+         $PKG/usr/libexec \
+         $PKG/usr/doc/$PRGNAM-$VERSION \
+         $PKG/install \
+         $PKG/usr/games
 
-mv readme_linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
-mv typhoon $PKG/usr/libexec
-mv * $PKG/usr/share/games/$PRGNAM
+cp -a readme_linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a typhoon $PKG/usr/libexec
+cp -a game *.mod *.dat $PKG/usr/share/games/$PRGNAM
 
-install -m 0755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -m 0755 $CWD/$PRGNAM $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 # Icon extracted from the windows .exe with wrestool, converted with icotool
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+mkdir -p $PKG/usr/share/pixmaps \
+         $PKG/usr/share/icons/hicolor/32x32/apps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/games/typhoon_2001/typhoon_2001.desktop b/games/typhoon_2001/typhoon_2001.desktop
index 75fef3dfc9..30702c0be8 100644
--- a/games/typhoon_2001/typhoon_2001.desktop
+++ b/games/typhoon_2001/typhoon_2001.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Typhoon 2001
-Exec=typhoon_2001
+Exec=/usr/games/typhoon_2001
 Type=Application
 Icon=typhoon_2001
-GenericName=Typhoon 2001 Game
+GenericName=Tempest-like game
 Categories=Game;ArcadeGame;