diff --git a/sdk/scripts/package-linux.sh b/sdk/scripts/package-linux.sh index e7b7fce..76974f3 100755 --- a/sdk/scripts/package-linux.sh +++ b/sdk/scripts/package-linux.sh @@ -23,7 +23,8 @@ esac DIST_ROOT="$ROOT/dist" PKG_NAME="openbitdo-${VERSION}-linux-${ARCH_LABEL}" -PKG_DIR="$DIST_ROOT/$PKG_NAME" +STAGE_ROOT="$(mktemp -d)" +PKG_DIR="$STAGE_ROOT/$PKG_NAME" BIN_ASSET="$DIST_ROOT/${PKG_NAME}" checksum_file() { @@ -50,7 +51,6 @@ build_binary() { BIN_PATH="$(build_binary)" -rm -rf "$PKG_DIR" mkdir -p "$PKG_DIR/bin" "$DIST_ROOT" cp "$BIN_PATH" "$PKG_DIR/bin/openbitdo" @@ -59,7 +59,8 @@ cp "$REPO_ROOT/README.md" "$PKG_DIR/README.md" cp "$ROOT/README.md" "$PKG_DIR/SDK_README.md" cp "$REPO_ROOT/LICENSE" "$PKG_DIR/LICENSE" -tar -C "$DIST_ROOT" -czf "$DIST_ROOT/${PKG_NAME}.tar.gz" "$PKG_NAME" +tar -C "$STAGE_ROOT" -czf "$DIST_ROOT/${PKG_NAME}.tar.gz" "$PKG_NAME" +rm -rf "$STAGE_ROOT" checksum_file "$DIST_ROOT/${PKG_NAME}.tar.gz" checksum_file "$BIN_ASSET" diff --git a/sdk/scripts/package-macos.sh b/sdk/scripts/package-macos.sh index cb7e229..2c9928c 100755 --- a/sdk/scripts/package-macos.sh +++ b/sdk/scripts/package-macos.sh @@ -20,7 +20,8 @@ fi DIST_ROOT="$ROOT/dist" PKG_NAME="openbitdo-${VERSION}-macos-${ARCH_LABEL}" -PKG_DIR="$DIST_ROOT/$PKG_NAME" +STAGE_ROOT="$(mktemp -d)" +PKG_DIR="$STAGE_ROOT/$PKG_NAME" BIN_ASSET="$DIST_ROOT/${PKG_NAME}" PKG_ASSET="$DIST_ROOT/${PKG_NAME}.pkg" PKGROOT="$DIST_ROOT/${PKG_NAME}-pkgroot" @@ -45,7 +46,7 @@ build_binary() { BIN_PATH="$(build_binary)" VERSION_STRIPPED="${VERSION#v}" -rm -rf "$PKG_DIR" "$PKGROOT" "$PKG_ASSET" +rm -rf "$PKGROOT" "$PKG_ASSET" mkdir -p "$PKG_DIR/bin" "$DIST_ROOT" cp "$BIN_PATH" "$PKG_DIR/bin/openbitdo" @@ -54,7 +55,8 @@ cp "$REPO_ROOT/README.md" "$PKG_DIR/README.md" cp "$ROOT/README.md" "$PKG_DIR/SDK_README.md" cp "$REPO_ROOT/LICENSE" "$PKG_DIR/LICENSE" -tar -C "$DIST_ROOT" -czf "$DIST_ROOT/${PKG_NAME}.tar.gz" "$PKG_NAME" +tar -C "$STAGE_ROOT" -czf "$DIST_ROOT/${PKG_NAME}.tar.gz" "$PKG_NAME" +rm -rf "$STAGE_ROOT" mkdir -p "$PKGROOT${INSTALL_PREFIX}" cp "$BIN_PATH" "$PKGROOT${INSTALL_PREFIX}/openbitdo"