From 5575cbc34b243f62259371f787dd92ef5cf89610 Mon Sep 17 00:00:00 2001
From: grasci <86058054+grasci-arm@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:15:44 +0000
Subject: [PATCH] [buildmgr] Update cpackget: remove `pack` command from tests
 and scripts

---
 tools/buildmgr/cbuildgen/installer/create_installer.sh     | 2 +-
 tools/buildmgr/cbuildgen/installer/make_deb.sh             | 2 +-
 tools/buildmgr/docs/doxygen/Build/src/CmdLineBuild.txt     | 6 +++---
 tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp | 2 +-
 tools/buildmgr/test/scripts/download_packs.sh              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/buildmgr/cbuildgen/installer/create_installer.sh b/tools/buildmgr/cbuildgen/installer/create_installer.sh
index 3559079e0..47c295f97 100755
--- a/tools/buildmgr/cbuildgen/installer/create_installer.sh
+++ b/tools/buildmgr/cbuildgen/installer/create_installer.sh
@@ -61,7 +61,7 @@ cp -R ../config/. ${distdir}/etc
 cp ../../docs/LICENSE.txt ${distdir}
 
 # Get cpackget
-cpackget_version="1.0.1"
+cpackget_version="1.1.0"
 cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
 curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards    '*cpackget'     > ${distdir}/bin/cpackget.lin-amd64
 curl --retry 3 -L ${cpackget_base}_windows_amd64.zip   -o temp.zip && unzip -p temp.zip '*/cpackget.exe' > ${distdir}/bin/cpackget.exe-amd64 && rm temp.zip
diff --git a/tools/buildmgr/cbuildgen/installer/make_deb.sh b/tools/buildmgr/cbuildgen/installer/make_deb.sh
index e15e60b10..66e3d81a4 100755
--- a/tools/buildmgr/cbuildgen/installer/make_deb.sh
+++ b/tools/buildmgr/cbuildgen/installer/make_deb.sh
@@ -95,7 +95,7 @@ mkdir -p etc/${PACKAGE_NAME}
 mkdir -p etc/profile.d
 
 # Get cpackget
-cpackget_version="1.0.1"
+cpackget_version="1.1.0"
 cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
 curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${input}/bin/cpackget.lin-amd64
 
diff --git a/tools/buildmgr/docs/doxygen/Build/src/CmdLineBuild.txt b/tools/buildmgr/docs/doxygen/Build/src/CmdLineBuild.txt
index d06fd491e..3e0f5a325 100644
--- a/tools/buildmgr/docs/doxygen/Build/src/CmdLineBuild.txt
+++ b/tools/buildmgr/docs/doxygen/Build/src/CmdLineBuild.txt
@@ -650,7 +650,7 @@ be downloaded and installed.
 \b cpackget is called from the \b Bash command line with the following syntax:
 
 \code
-cpackget pack add -f <pack-list-file>
+cpackget add -f <pack-list-file>
 \endcode
 
 <b>Where:</b>
@@ -705,11 +705,11 @@ The error messages that the cpackget prints are mostly self explanatory. Here ar
 
 \code
   # Trying to install a pack without specifying a pack root
-  $ cpackget pack add -f Simulation.cpinstall
+  $ cpackget add -f Simulation.cpinstall
   E: pack root not found
 
   # Trying to install a pack using an invalid pack url
-  $ cpackget pack add not-a-pack-path --pack-root packroot
+  $ cpackget add not-a-pack-path --pack-root packroot
   E: bad pack name: pack extension should be "pdsc", "pack" or "zip"
 \endcode
 
diff --git a/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp b/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp
index 3795748d7..ff385da35 100644
--- a/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp
+++ b/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp
@@ -44,7 +44,7 @@ void CPackGetTests::RunPackAdd(const TestParam& param, bool env) {
   int ret_val;
   // "-a" means "agree with embedded license"
   // "-f" means "filename with pack list"
-  RunCPackGet(" pack add -a -f ", param, env, &ret_val);
+  RunCPackGet(" add -a -f ", param, env, &ret_val);
   ASSERT_EQ(param.expect, (ret_val == 0) ? true : false);
 }
 
diff --git a/tools/buildmgr/test/scripts/download_packs.sh b/tools/buildmgr/test/scripts/download_packs.sh
index 29b7f75c5..0b6d87c54 100755
--- a/tools/buildmgr/test/scripts/download_packs.sh
+++ b/tools/buildmgr/test/scripts/download_packs.sh
@@ -49,6 +49,6 @@ echo https://www.keil.com/pack/ARM.CMSIS.5.9.0.pack >> ${packlist}
 echo https://www.keil.com/pack/Keil.ARM_Compiler.1.7.2.pack >> ${packlist}
 echo http://www.keil.com/pack/Keil.STM32F4xx_DFP.2.14.0.pack >> ${packlist}
 echo http://www.keil.com/pack/Keil.MDK-Middleware.7.11.1.pack >> ${packlist}
-cpackget pack add -a -f ${packlist}
+cpackget add -a -f ${packlist}
 
 exit 0
\ No newline at end of file