X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Ffpkg;h=dd855d95875cea9360a18a9c68608c8368a55b39;hb=e86c8c1390ce05391cb6b5bd45f0489b1a8d848e;hp=878136615444d24964c3a9c1d52cf7d7f291d3e9;hpb=abe5449c7fd7ccd5eae2f721db34cce1f643ee8a;p=hvlinux.git

diff --git a/functions/fpkg b/functions/fpkg
index 8781366..dd855d9 100644
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -274,8 +274,12 @@ test_archive_integrity()
         TESTCMD="bzip2 -t"
     elif is_archive_tar_gzip "${EXT}"; then
         TESTCMD="gunzip -t"
+    elif [ "x${EXT}" = "xtar.xz" ]; then
+        TESTCMD="unxz -t"
+    elif [ "x${EXT}" = "xzip" ]; then
+        TESTCMD="unzip -t"
     else
-        # Can only test gzip and bzip2 archives
+        # Can only test gzip, bzip2, xz and zip archives.
         return 0
     fi
 
@@ -383,7 +387,7 @@ fpkg()
                     # Default subdirectory on server
 	            SRC_DIR=$(get_pkg_name ${PACK})
                 fi
-                SRC_DIR="${SRC_DIR}/$(get_pkg_ver_base ${PACK})"
+                SRC_DIR="${SRC_DIR}/$(get_pkg_ver2 ${PACK})"
                 ;;
             sf)
                 URL=${SOURCEFORGE_URL}