1 files changed, 8 insertions, 20 deletions
diff --git a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild
index fe2458ce8f..27047ef064 100644
--- a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild
+++ b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild
@@ -25,14 +25,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ttf-babelstone-cjk
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
-SRCH=${SRCH:-BabelStoneHan}
-SRCS=${SRCS:-BabelStoneShuishu}
-SRCT=${SRCT:-TangutScanFonts}
 
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
@@ -50,6 +47,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -57,27 +56,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -pv $TMP/han
-mkdir -pv $TMP/sui
-mkdir -pv $TMP/tangut
 mkdir -pv $PKG/usr/share/fonts/TTF
+find $TMP/$PRGNAM-$VERSION/ttf/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
 
-unzip -d $TMP/han $CWD/$SRCH.zip
-unzip -d $TMP/sui $CWD/$SRCS.zip
-unzip -d $TMP/tangut $CWD/$SRCT.zip
-
-install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF
-install -D -m0644 -v $TMP/han/*.ttf -t $PKG/usr/share/fonts/TTF
-install -D -m0644 -v $TMP/sui/*.ttf -t $PKG/usr/share/fonts/TTF
-install -D -m0644 -v $TMP/tangut/*.ttf -t $PKG/usr/share/fonts/TTF
+if [ "$archaic" = "yes" ]; then
+    find $TMP/$PRGNAM-$VERSION/archaic/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+fi
 
 mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/APL.txt >  $PKG/usr/doc/$PRGNAM-$VERSION/APL.txt
-cat $CWD/BabelStoneOFL.txt > $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt
+cp -av APL.txt COPYRIGHT IDS.TXT LICENSE OFL.txt readme_fonts   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright
-cat $CWD/copyright2 > $PKG/usr/doc/$PRGNAM-$VERSION/copyright2
-cat $CWD/readme_fonts > $PKG/usr/doc/$PRGNAM-$VERSION/readme_fonts
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
 
 mkdir -p $PKG/install