Fix release scripts (#9)

freenet · Sep 27, 2023 · 5a8080f · 5a8080f
1 parent 6f60893
commit 5a8080f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/scripts/release-rust-ver.sh b/scripts/release-rust-ver.sh
@@ -2,7 +2,6 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR && cd ..
 SRC_DIR=$(pwd)
-source typescript/package.prod.sh
 cd $SRC_DIR
 
 cargo publish --dry-run -p freenet-macros || { exit 1; }

diff --git a/typescript/package.dev.sh b/typescript/package.dev.sh
@@ -4,14 +4,14 @@ set -e
 npm install --save-dev .
 npm run test
 npm run build
-if [ "$1"="dev" ]; then 
+if [ "$1" = "dev" ]; then 
 PKG_DIR=$SCRIPT_DIR/dist/pack
 IS_DEV=1
 else
-PKG_DIR=${1:-$(mktemp -d)}
-fi
-mkdir -p  $PKG_DIR
+PKG_DIR="$1"
 echo "Package dir: $PKG_DIR"
+fi
+mkdir -p $PKG_DIR
 cd $PKG_DIR
 cp -r $SCRIPT_DIR/dist/src/* $PKG_DIR
 cp $SCRIPT_DIR/README.md $SCRIPT_DIR/package.json $PKG_DIR

diff --git a/typescript/package.json b/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@freenetorg/freenet-stdlib",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Freenet standard library and utils",
   "main": "src/index.ts",
   "files": [

diff --git a/typescript/package.prod.sh b/typescript/package.prod.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PKG_DIR=$(mktemp -d)
-source ./package.dev.sh $PKG_DIR
+./package.dev.sh "$PKG_DIR"
 echo "Packages at $PKG_DIR"
-OUTPUT=$(find . -type f -name '*.tgz')
+OUTPUT=$(find $PKG_DIR -type f -name '*.tgz')
 echo "Publishing $OUTPUT ..."
 read -p "Proceed publishing? " -n 1 -r
 echo