Fix Slackuild creation

3 files changed, 24 insertions, 20 deletions

diff --git a/slackbuild/sbotools2/sbotools2.SlackBuild b/slackbuild/sbotools2/sbotools2.SlackBuild
index 203feba..3e98a3f 100644
--- a/slackbuild/sbotools2/sbotools2.SlackBuild
+++ b/slackbuild/sbotools2/sbotools2.SlackBuild
@@ -25,7 +25,7 @@
 
 
 PRGNAM=sbotools2
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-@VERSION@}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -89,7 +89,7 @@ find $PKG -depth -type d -empty -delete || true
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
 cp -a SBO-Lib/README $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a LICENSE.txt README.md ChangeLog.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a LICENSE.txt ChangeLog.md $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/slackbuild/sbotools2/sbotools2.info b/slackbuild/sbotools2/sbotools2.info
index 2ca24f7..5f7b28b 100644
--- a/slackbuild/sbotools2/sbotools2.info
+++ b/slackbuild/sbotools2/sbotools2.info
@@ -1,5 +1,5 @@
 PRGNAM="sbotools2"
-VERSION="2.7.2"
+VERSION="@VERSION@"
 HOMEPAGE="https://git.server.ky/slackcoder/sbotools2/about/"
 DOWNLOAD="https://git.server.ky/slackcoder/sbotools2/snapshot/@FILENAME@"
 MD5SUM="@MD5@"
diff --git a/tools/package_up.sh b/tools/package_up.sh
index b249bda..d9acf14 100755
--- a/tools/package_up.sh
+++ b/tools/package_up.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PACKAGE="sbotools2"
-VERSION=$(grep '^our $VERSION' SBO-Lib/lib/SBO/Lib.pm | grep -Eo '[0-9]+(\.[0-9RC@gita-f]+){0,1}')
+VERSION=$(grep '^our $VERSION' SBO-Lib/lib/SBO/Lib.pm | grep -Eo '[0-9]+(\.[0-9RC@gita-f]+){0,2}')
 FILENAME=$PACKAGE-$VERSION.tar.gz
 
 echo "Making package for $PACKAGE-$VERSION." \
@@ -17,20 +17,22 @@ cleanup() {
 }
 
 update_info() {
-    INFO=$1
+    FILE=$1
     MD5=$(md5sum $PKG_HOME/$FILENAME | cut -d' ' -f1)
-    sed -i -e "s/@FILENAME@/$FILENAME/" $INFO
-    sed -i -e "s/@MD5@/$MD5/" $INFO
+    sed -i -e "s/@FILENAME@/$FILENAME/" $FILE
+    sed -i -e "s/@VERSION@/$VERSION/" $FILE
+    sed -i -e "s/@MD5@/$MD5/" $FILE
 }
 
 TMP_DIR=$(mktemp -d /tmp/$PACKAGE.XXXXXXXXXXXX)
-PKG_DIR=$TMP_DIR/$PACKAGE-$VERSION
-SBO_DIR=$TMP_DIR/$PACKAGE
-mkdir $PKG_DIR
-mkdir $SBO_DIR
+PKG_DIR="$TMP_DIR/$PACKAGE-$VERSION"
+SBO_DIR="$TMP_DIR/$PACKAGE"
+mkdir "$PKG_DIR"
+mkdir "$SBO_DIR"
 
-for i in $(ls $PKG_HOME); do
-	cp -R $PKG_HOME/$i $PKG_DIR
+find "$PKG_HOME" -maxdepth 1 | while read f
+do
+	cp -R "$f" "$PKG_DIR"
 done
 
 for remove in t tools README.md TODO; do
@@ -47,17 +49,19 @@ if [[ -d $PKG_DIR/slackbuild/$PACKAGE ]]; then
 fi
 
 
-find $TMP_DIR -type f -name \*~ -exec rm {} \;
+find "$TMP_DIR" -type f -name \*~ -exec rm {} \;
 
-(cd $TMP_DIR
+(cd "$TMP_DIR"
 	tar cvzf $FILENAME $PACKAGE-$VERSION/
 	cp $FILENAME $PKG_HOME
 )
-(cd $TMP_DIR
+(cd "$TMP_DIR"
     update_info "$PACKAGE/$PACKAGE.info"
-	tar cjf $PACKAGE.tar.bz2 $PACKAGE/
+    update_info "$PACKAGE/$PACKAGE.SlackBuild"
+    grep VERSION "$PACKAGE/$PACKAGE.SlackBuild"
+    tar cjf $PACKAGE.tar.bz2 $PACKAGE/
 )
-mv $TMP_DIR/$PACKAGE.tar.bz2 $PKG_HOME
+mv "$TMP_DIR/$PACKAGE.tar.bz2" "$PKG_HOME"
 
-cleanup $TMP_DIR
+cleanup "$TMP_DIR"
 exit 0