From 516c681183d4bb670a3a3017f5303eff6d58d5e9 Mon Sep 17 00:00:00 2001 From: "chess.griffin" Date: Tue, 12 May 2009 14:03:29 +0000 Subject: [PATCH] add support for new *.txz, *.tbz, and *.tlz Slackware package extensions. --- ChangeLog-current.txt | 1 + src/usr/sbin/sbopkg | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog-current.txt b/ChangeLog-current.txt index c004bb6..90f273e 100644 --- a/ChangeLog-current.txt +++ b/ChangeLog-current.txt @@ -48,4 +48,5 @@ enhancements: * Move sbopkg-renames to new /etc/sbopkg/renames.d/50-default to manage multiple renames files. Thanks to Robby Workman for the suggestion. Add new document README-renames.d that explains how this works. + * Add support for new *.txz, *.tlz, and *.tbz Slackware package extensions. +--------------------------+ diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 3b5011c..d84e873 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -829,7 +829,7 @@ view_app_file() { case $FILE in slack-desc ) sed -n "/^${DIR##*/}: */s///p" slack-desc > $AFSP ;; - *tar.gz | *tar.bz2 | *tgz ) + *tar.gz | *tar.bz2 | *t?z ) tar tvf $FILE > $AFSP ;; *gz ) zcat $FILE > $AFSP ;; *bz2 ) bzcat $FILE > $AFSP ;; @@ -897,7 +897,7 @@ info_item() { done if $(echo $(ls -1 $OUTPUT) | grep -E -q "$APP.*$CURVERSION"); then CURPACKAGE="$( - basename $(ls -1 $OUTPUT/${APP}*${CURVERSION}*${CURBUILD}*tgz| + basename $(ls -1 $OUTPUT/${APP}*${CURVERSION}*${CURBUILD}*t?z| head -n 1) )" else @@ -2394,7 +2394,7 @@ build_package() { # Let's see the result cd $SB_OUTPUT - if [ ! -f *.tgz ]; then + if [ ! -f *.t?z ]; then echo "$PKGNAME:" >> $SUMMARYLOG echo "Error occurred with build. Please check the log." \ >> $SUMMARYLOG @@ -2425,7 +2425,7 @@ build_package() { fi else echo "Done building package for $PKG." - NEWPACKAGE=$(ls -1 *.tgz) + NEWPACKAGE=$(ls -1 *.t?z) echo "$PKGNAME:" >> $SUMMARYLOG echo "Built package: $NEWPACKAGE" >> $SUMMARYLOG echo "Built package: $NEWPACKAGE"