Merge pull request #208 from radarhere/untar

Updated multibuild

Author: hugovk

config.sh

@@ -18,26 +18,13 @@ LIBWEBP_VERSION=1.2.0
 BZIP2_VERSION=1.0.8
 LIBXCB_VERSION=1.14
 
-# workaround for multibuild bug with .tar.xz
-function untar {
-    local in_fname=$1
-    if [ -z "$in_fname" ];then echo "in_fname not defined"; exit 1; fi
-    local extension=${in_fname##*.}
-    case $extension in
-        tar) tar -xf $in_fname ;;
-        gz|tgz) tar -zxf $in_fname ;;
-        bz2) tar -jxf $in_fname ;;
-        zip) unzip -qq $in_fname ;;
-        xz) if [ -n "$IS_MACOS" ]; then
-              tar -xf $in_fname
-            else
-              if [[ ! $(type -P "unxz") ]]; then
-                echo xz must be installed to uncompress file; exit 1
-              fi
-              unxz -c $in_fname | tar -xf -
-            fi ;;
-        *) echo Did not recognize extension $extension; exit 1 ;;
-    esac
+function pyinst_fname_for_version {
+    local inst_ext=$(pyinst_ext_for_version $1)
+    if [ "${PLAT:-}" == "arm64" ]; then
+        echo "python-$1-macos11.${inst_ext}"
+    else
+        echo "python-$1-macosx$2.${inst_ext}"
+    fi
 }
 
 function pre_build {