games/jfsw_demo_data: Modified to coexist with jfsw_registered_data.

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

3 files changed, 31 insertions, 19 deletions

diff --git a/games/jfsw_demo_data/README b/games/jfsw_demo_data/README
index 748daee767e3..202c6ac361ad 100644
--- a/games/jfsw_demo_data/README
+++ b/games/jfsw_demo_data/README
@@ -1,10 +1,17 @@
 jfsw_demo_data (Shadow Warrior shareware data file for use with jfsw)
 
-The data file is proprietary, copyrighted by 3DRealms, Inc. See
-LICENSE.TXT for more information.
+This is the demo/shareware version of Shadow Warrior, for use with the
+jfsw game engine.
 
-If you own a registered/retail copy of Shadow Warrior, you don't need
-this package (instead, copy "sw.grp" from the game directory or CD to
-"/usr/share/games/jfsw/sw.grp").
+Shadow Warrior is a first-person shooter video game developed by 3D
+Realms and published by GT Interactive Software. The shareware version
+was released for the PC on May 13, 1997, while the full version was
+released on August 31, 1997. Shadow Warrior was developed using Ken
+Silverman's Build engine.
+
+The jfsw launcher supports both the demo (jfsw_demo_data) version and the
+full version (jfsw_registered_data). Since the full version includes the
+levels from the demo version (as Episode 1), there's no need to install
+both on the same system, although this is supported.
 
 This package can't be used with jfsw_hires_pack.
diff --git a/games/jfsw_demo_data/jfsw_demo_data.SlackBuild b/games/jfsw_demo_data/jfsw_demo_data.SlackBuild
index 82d56bbfe401..a0bcbbc2e2d4 100644
--- a/games/jfsw_demo_data/jfsw_demo_data.SlackBuild
+++ b/games/jfsw_demo_data/jfsw_demo_data.SlackBuild
@@ -6,10 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180714 bkw:
+# - updated slightly, to coexist with jfsw_registered_data.
+# - get rid of LFs in text files, rename to lowercase.
+
 PRGNAM=jfsw_demo_data
 VERSION=${VERSION:-1.2}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -31,21 +35,22 @@ unzip -o $ZIPFILE2
 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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/games/jfsw
-cat $GRPFILE > $PKG/usr/share/games/jfsw/sw.grp
+cat $GRPFILE > $PKG/usr/share/games/jfsw/sw_demo.grp
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  *.TXT \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+for i in *.TXT; do
+  sed 's,\r,,' < $i > $PKG/usr/doc/$PRGNAM-$VERSION/$( echo $i | tr A-Z a-z )
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/jfsw_demo_data/slack-desc b/games/jfsw_demo_data/slack-desc
index 1195864d5168..7019321cc690 100644
--- a/games/jfsw_demo_data/slack-desc
+++ b/games/jfsw_demo_data/slack-desc
@@ -8,12 +8,12 @@
               |-----handy-ruler------------------------------------------------------|
 jfsw_demo_data: jfsw_demo_data (Shadow Warrior shareware data file for use with jfsw)
 jfsw_demo_data:
-jfsw_demo_data: Shadow Warrior shareware data file.
-jfsw_demo_data: If you own a registered/retail copy of Shadow Warrior, you don't need
-jfsw_demo_data: this package.
-jfsw_demo_data:
-jfsw_demo_data:
-jfsw_demo_data:
-jfsw_demo_data:
+jfsw_demo_data: This is the full/registered version of Shadow Warrior, for use with
+jfsw_demo_data: the jfsw game engine.
 jfsw_demo_data:
+jfsw_demo_data: Shadow Warrior is a first-person shooter video game developed by 3D
+jfsw_demo_data: Realms and published by GT Interactive Software. The shareware version
+jfsw_demo_data: was released for the PC on May 13, 1997, while the full version was
+jfsw_demo_data: released on August 31, 1997. Shadow Warrior was developed using Ken
+jfsw_demo_data: Silverman's Build engine.
 jfsw_demo_data: