games/jfsw_demo_data: Simplify script.

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

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

3 files changed, 24 insertions, 27 deletions

diff --git a/games/jfsw_demo_data/README b/games/jfsw_demo_data/README
index f1cf3d036117c..240c3d920f419 100644
--- a/games/jfsw_demo_data/README
+++ b/games/jfsw_demo_data/README
@@ -13,5 +13,3 @@ 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 cf0cb37dd836f..efca670fb33e4 100644
--- a/games/jfsw_demo_data/jfsw_demo_data.SlackBuild
+++ b/games/jfsw_demo_data/jfsw_demo_data.SlackBuild
@@ -6,6 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211031 bkw: BUILD=3
+# - remove "can't be used with jfsw_hires_pack" from README, since
+#   it's no longer true.
+# - simplify script.
+# - only extract the files we need from the zipfiles.
+# - let unzip do the CRLF conversions.
+# - preserve timestamps (minor detail I know).
+
 # 20180714 bkw:
 # - updated slightly, to coexist with jfsw_registered_data.
 # - get rid of LFs in text files, rename to lowercase.
@@ -15,13 +23,10 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=jfsw_demo_data
 VERSION=${VERSION:-1.2}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# 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
@@ -33,32 +38,26 @@ OUTPUT=${OUTPUT:-/tmp}
 
 ZIPFILE1=${ZIPFILE1:-3dsw12.zip}
 ZIPFILE2=${ZIPFILE2:-SWSW12.SHR}
-GRPFILE=${GRPFILE:-SW.GRP}
+GRPFILE=${GRPFILE:-sw.grp}
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+GAMEDIR=$PKG/usr/share/games/jfsw
+GRPDEST=sw_demo.grp
 
 set -e
 
 rm -rf $TMP/$PRGNAM $PKG
-mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
+mkdir -p $TMP/$PRGNAM $OUTPUT $GAMEDIR $PKGDOC $PKG/install
 cd $TMP/$PRGNAM
-unzip $CWD/$ZIPFILE1
-unzip -o $ZIPFILE2
+unzip $CWD/$ZIPFILE1 $ZIPFILE2
+unzip -LL -a -o $ZIPFILE2 '*.grp' '*.txt'
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p $PKG/usr/share/games/jfsw
-cat $GRPFILE > $PKG/usr/share/games/jfsw/sw_demo.grp
-
-mkdir -p $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
+chmod 644 *
+
+cp -a $GRPFILE $GAMEDIR/$GRPDEST
+cp -a *.txt $PKGDOC
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
diff --git a/games/jfsw_demo_data/jfsw_demo_data.info b/games/jfsw_demo_data/jfsw_demo_data.info
index 68eb7aa5eb034..16123aa5d0b94 100644
--- a/games/jfsw_demo_data/jfsw_demo_data.info
+++ b/games/jfsw_demo_data/jfsw_demo_data.info
@@ -1,6 +1,6 @@
 PRGNAM="jfsw_demo_data"
 VERSION="1.2"
-HOMEPAGE="http://legacy.3drealms.com/sw/"
+HOMEPAGE="https://legacy.3drealms.com/sw/"
 DOWNLOAD="ftp://ftp.3drealms.com/share/3dsw12.zip"
 MD5SUM="d77564e8764feeb1509dd0d534fb8952"
 DOWNLOAD_x86_64=""