diff --git a/make.sh b/make.sh index 14d826cf1e3..0dbe57eb49c 100755 --- a/make.sh +++ b/make.sh @@ -225,7 +225,7 @@ package() { local pkg_path if [[ "$target" == "x86_64-w64-mingw32" ]]; then pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.zip")" - else + else pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.tar.gz")" fi @@ -241,11 +241,8 @@ package() { echo "> packaging: ${pkg_name} from ${versioned_build_dir}" if [[ "$target" == "x86_64-w64-mingw32" ]]; then - _ensure_enter_dir "${versioned_build_dir}" - cd .. - local dir_to_zip - dir_to_zip=$(basename "${versioned_build_dir}") - zip -r "${pkg_path}" "${dir_to_zip}/" + _ensure_enter_dir "${build_dir}" + zip -r "${pkg_path}" "$(basename "${versioned_build_dir}")" else _ensure_enter_dir "${versioned_build_dir}" _tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*