[Backport 2.8] Fix reference to tsc binary when publishing shell (#12191

) * Fix reference to tsc binary when publishing shell (#12176) * Fix BASE_DIR path * Add pipefail for proper error handling * Bump shell package 1.2.5-rc.2
rancher · Oct 10, 2024 · fb07626 · fb07626
1 parent 15a2812
commit fb07626
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/shell/package.json b/shell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "1.2.5-rc.1",
+  "version": "1.2.5-rc.2",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

diff --git a/shell/scripts/publish-shell.sh b/shell/scripts/publish-shell.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 
+set -eo pipefail
+
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(
-  cd $SCRIPT_DIR && cd ../.. &
-  pwd
-)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell/
 CREATORS_DIR=$BASE_DIR/creators/extension
 FORCE_PUBLISH_TO_NPM="false"

diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell
 
 echo "Generating typescript definitions"