diff --git a/scripts/publish.sh b/scripts/publish.sh index 99046a1..81d7e6d 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -11,10 +11,9 @@ if [[ "$YARN_MAJOR" -ge "3" ]]; then PACK_CMD="yarn pack --out /tmp/%s-%v.tgz" # install is handled by yarn berry pack/publish INSTALL_CMD="" - LOGIN_CMD="" else echo "Warning: Did not detect compatible yarn version. This action officially supports Yarn v3 and newer. Falling back to using npm." >&2 - echo "//registry.npmjs.org/:_authToken=${YARN_NPM_AUTH_TOKEN}" >> $HOME/.npmrc + echo "//registry.npmjs.org/:_authToken=${YARN_NPM_AUTH_TOKEN}" >> "$HOME/.npmrc" PUBLISH_CMD="npm publish --tag $PUBLISH_NPM_TAG" PACK_CMD="npm pack --pack-destination=/tmp/" if [[ -f 'yarn.lock' ]]; then @@ -25,7 +24,7 @@ else fi # "dry-run" for polyrepo -if [[ -z $YARN_NPM_AUTH_TOKEN && ! -n "$1" ]]; then +if [[ -z "$YARN_NPM_AUTH_TOKEN" && -z "$1" ]]; then echo "Notice: 'npm-token' not set. Running '$PACK_CMD'." $INSTALL_CMD $PACK_CMD @@ -53,7 +52,7 @@ if [[ -n "$1" ]]; then LATEST_PACKAGE_VERSION=$(npm view "$PACKAGE_NAME" dist-tags --workspaces false --json | jq --raw-output --arg tag "$PUBLISH_NPM_TAG" '.[$tag]' || echo "") # "dry-run" for monorepo - if [ -z $YARN_NPM_AUTH_TOKEN && ! "$LATEST_PACKAGE_VERSION" = "$CURRENT_PACKAGE_VERSION" ]; then + if [[ -z "$YARN_NPM_AUTH_TOKEN" && ! "$LATEST_PACKAGE_VERSION" = "$CURRENT_PACKAGE_VERSION" ]]; then echo "Notice: 'npm-token' not set. Running '$PACK_CMD'." $PACK_CMD exit 0 @@ -67,4 +66,4 @@ fi $INSTALL_CMD $PUBLISH_CMD -rm -f $HOME/.npmrc +rm -f "$HOME/.npmrc"