Be less strict about the package name suffix.

[pkgutils-cross.git] / pkgmk.in

diff --git a/pkgmk.in b/pkgmk.in
index 00d8e954720888c3e42806ea0841bdde1615e7bd..b8e3e4e1957086b9b255e31973dfdb64f8a5206d 100755 (executable)
--- a/pkgmk.in
+++ b/pkgmk.in
@@ -34,13 +34,11 @@ error() {
 }
 
 get_filename() {
-       local FILE="`echo $1 | sed 's|^.*://.*/||g'`"
-
-       if [ "$FILE" != "$1" ]; then
-               FILE="$PKGMK_SOURCE_DIR/$FILE"
+       if [[ $1 =~ ^(http|https|ftp|file)://.*/(.+) ]]; then
+               echo "$PKGMK_SOURCE_DIR/${BASH_REMATCH[2]}"
+       else
+               echo $1
        fi
-
-       echo $FILE
 }
 
 get_basename() {
@@ -77,6 +75,13 @@ check_directory() {
        fi
 }
 
+check_file() {
+       if [ -e $1 ] && [ ! -w $1 ]; then
+               error "File '$1' is not writable."
+               exit 1
+       fi
+}
+
 download_file() {
        info "Downloading '$1'."
 
@@ -157,12 +162,8 @@ unpack_source() {
        for FILE in ${source[@]}; do
                LOCAL_FILENAME=`get_filename $FILE`
                case $LOCAL_FILENAME in
-                       *.tar.gz|*.tar.Z|*.tgz)
-                               COMMAND="tar -C $SRC --use-compress-program=gzip -xf $LOCAL_FILENAME" ;;
-                       *.tar.bz2)
-                               COMMAND="tar -C $SRC --use-compress-program=bzip2 -xf $LOCAL_FILENAME" ;;
-                       *.zip)
-                               COMMAND="unzip -qq -o -d $SRC $LOCAL_FILENAME" ;;
+                       *.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.rpm)
+                               COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
                        *)
                                COMMAND="cp $LOCAL_FILENAME $SRC" ;;
                esac
@@ -353,6 +354,7 @@ remove_work_dir() {
 build_package() {
        local BUILD_SUCCESSFUL="no"
        
+       check_file "$TARGET"
        make_work_dir
 
        if [ "$UID" != "0" ]; then
@@ -464,6 +466,7 @@ update_footprint() {
                exit 1
        fi
        
+       check_file "$PKGMK_FOOTPRINT"
        make_footprint > $PKGMK_FOOTPRINT
        touch $TARGET
        
@@ -618,6 +621,7 @@ main() {
        
        if [ "$PKGMK_UPDATE_MD5SUM" = "yes" ]; then
                download_source
+               check_file "$PKGMK_MD5SUM"
                make_md5sum > $PKGMK_MD5SUM
                info "Md5sum updated."
                exit 0