Update versions and sync-up installer

Open-CMSIS-Pack · Sep 6, 2022 · 512bb90 · 512bb90
2 parents ab8b5d9 + 7cea068
commit 512bb90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml
@@ -39,7 +39,7 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: "Open-CMSIS-Pack/devtools"
-          version: tags/tools/buildmgr/1.0.0
+          version: tags/tools/buildmgr/1.1.0
           file: cbuild_install.sh
           target: toolbox/cbuild/cbuild_install.sh
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -48,7 +48,7 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: "Open-CMSIS-Pack/devtools"
-          version: tags/tools/projmgr/1.0.0
+          version: tags/tools/projmgr/1.1.0
           file: projmgr.zip
           target: toolbox/projmgr/projmgr.zip
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/installer/install.sh b/installer/install.sh
@@ -280,16 +280,15 @@ esac
 # update environment variables in etc/setup file
 # Note not using in-place editing in sed as it is not portable
 setup="${install_dir}"/etc/setup
-sed -e "s|export CMSIS_BUILD_ROOT.*|export CMSIS_BUILD_ROOT=${install_dir// /\\\\ }/bin|"\
-    -e "s|export CMSIS_PACK_ROOT.*|export CMSIS_PACK_ROOT=${cmsis_pack_root}|"\
+sed -e "s|export CMSIS_PACK_ROOT.*|export CMSIS_PACK_ROOT=${cmsis_pack_root}|"\
     -e "s|export CMSIS_COMPILER_ROOT.*|export CMSIS_COMPILER_ROOT=${cmsis_compiler_root// /\\\\ }|"\
     "${setup}" > temp.$$ && mv temp.$$ "${setup}"
 
 # setup WSL_Windows
 if [[ $OS == "WSL_Windows" ]]
   then
   echo -e '\n# Windows Subsystem for Linux (WSL) environment variables and shell functions'\
-          '\nexport WSLENV=CMSIS_PACK_ROOT/p:CMSIS_COMPILER_ROOT/p:CMSIS_BUILD_ROOT/p'\
+          '\nexport WSLENV=CMSIS_PACK_ROOT/p:CMSIS_COMPILER_ROOT/p'\
           '\ncbuildgen() { cbuildgen.exe "$@" ; }'\
           '\nexport -f cbuildgen'\
           '\ncpackget() { cpackget.exe "$@" ; }'\