From f2fef41a37fdee0889eb7940fe4a8bdba85d822b Mon Sep 17 00:00:00 2001
From: pozsa_k <krisztian.pozsa@psi.ch>
Date: Tue, 7 Feb 2023 16:26:13 +0100
Subject: [PATCH 1/3] Add aws cli

Close: #258
---
 Tools/awscli/build          | 25 +++++++++++++++++++++++++
 Tools/awscli/files/variants |  1 +
 Tools/awscli/modulefile     | 12 ++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100755 Tools/awscli/build
 create mode 100644 Tools/awscli/files/variants
 create mode 100644 Tools/awscli/modulefile

diff --git a/Tools/awscli/build b/Tools/awscli/build
new file mode 100755
index 0000000..ca3ba54
--- /dev/null
+++ b/Tools/awscli/build
@@ -0,0 +1,25 @@
+#!/usr/bin/env modbuild
+
+# download url actually not used, but the build script fails without it
+pbuild::set_download_url "https://github.com/aws/aws-cli/archive/refs/tags/$V.tar.gz"
+# pbuild::set_sha256sum 'gnuplot-5.2.4.tar.gz:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb'
+# pbuild::install_docfiles 'Copyright' 'NEWS' 'README'
+
+pbuild::add_to_group 'Tools'
+
+pbuild::configure() {
+    :
+}
+pbuild::compile() {
+    :
+}
+pbuild::install() {
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-$V.zip" -o "awscliv2.zip"
+    unzip awscliv2.zip
+    ./aws/install -i $PREFIX -b ${PREFIX}/bin --update
+}
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/awscli/files/variants b/Tools/awscli/files/variants
new file mode 100644
index 0000000..a749239
--- /dev/null
+++ b/Tools/awscli/files/variants
@@ -0,0 +1 @@
+awscli/2.9.21 unstable
diff --git a/Tools/awscli/modulefile b/Tools/awscli/modulefile
new file mode 100644
index 0000000..aa96a06
--- /dev/null
+++ b/Tools/awscli/modulefile
@@ -0,0 +1,12 @@
+#%Pmodule
+
+module-whatis       "Universal Command Line Interface for Amazon Web Services"
+module-url          "https://github.com/aws/aws-cli/tree/v2"
+module-license      "https://github.com/aws/aws-cli/blob/v2/LICENSE.txt"
+module-maintainer   "Krisztian Pozsa <krisztian.pozsa@psi.ch>"
+
+module-help         "
+The AWS Command Line Interface (AWS CLI) is a unified tool to manage your
+AWS services. With just one tool to download and configure, you can control
+multiple AWS services from the command line and automate them through scripts.
+"

From 162a833ac4435d79949f13b78e923b087f29affc Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 26 May 2025 09:50:40 +0200
Subject: [PATCH 2/3] awscli: new version and YAM config

---
 Tools/awscli/files/config.yaml | 27 +++++++++++++++++++++++++++
 Tools/awscli/files/variants    |  1 -
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 Tools/awscli/files/config.yaml
 delete mode 100644 Tools/awscli/files/variants

diff --git a/Tools/awscli/files/config.yaml b/Tools/awscli/files/config.yaml
new file mode 100644
index 0000000..ff27567
--- /dev/null
+++ b/Tools/awscli/files/config.yaml
@@ -0,0 +1,27 @@
+---
+format: 1
+awscli:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    systems: [.*]
+    build_functions:
+      configure: []
+      compile: []
+  shasums:
+  versions:
+    2.27.22:
+      config:
+        relstage: unstable
+        urls:
+          - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
+            name: $P-${V_PKG}.zip
+            unpacker: none
+    2.9.21:
+      config:
+        relstage: stable
+        urls:
+          - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
+            name: $P-${V_PKG}.zip
+            unpacker: none
diff --git a/Tools/awscli/files/variants b/Tools/awscli/files/variants
deleted file mode 100644
index a749239..0000000
--- a/Tools/awscli/files/variants
+++ /dev/null
@@ -1 +0,0 @@
-awscli/2.9.21 unstable

From e0d44d07eac5fb16f7c50bc489fbacad834d8b73 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 26 May 2025 09:51:01 +0200
Subject: [PATCH 3/3] awscli: new version and YAM config

---
 Tools/awscli/build             | 19 +++----------------
 Tools/awscli/files/config.yaml |  4 ++--
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Tools/awscli/build b/Tools/awscli/build
index ca3ba54..35c5125 100755
--- a/Tools/awscli/build
+++ b/Tools/awscli/build
@@ -1,23 +1,10 @@
 #!/usr/bin/env modbuild
 
-# download url actually not used, but the build script fails without it
-pbuild::set_download_url "https://github.com/aws/aws-cli/archive/refs/tags/$V.tar.gz"
-# pbuild::set_sha256sum 'gnuplot-5.2.4.tar.gz:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb'
-# pbuild::install_docfiles 'Copyright' 'NEWS' 'README'
-
-pbuild::add_to_group 'Tools'
-
-pbuild::configure() {
-    :
-}
-pbuild::compile() {
-    :
-}
 pbuild::install() {
-    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-$V.zip" -o "awscliv2.zip"
-    unzip awscliv2.zip
-    ./aws/install -i $PREFIX -b ${PREFIX}/bin --update
+	unzip "${PMODULES_DISTFILESDIR}/awscliv2.zip"
+	./aws/install -i $PREFIX -b ${PREFIX}/bin --update
 }
+
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Tools/awscli/files/config.yaml b/Tools/awscli/files/config.yaml
index ff27567..2759c63 100644
--- a/Tools/awscli/files/config.yaml
+++ b/Tools/awscli/files/config.yaml
@@ -13,14 +13,14 @@ awscli:
   versions:
     2.27.22:
       config:
-        relstage: unstable
+        relstage: stable
         urls:
           - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
             name: $P-${V_PKG}.zip
             unpacker: none
     2.9.21:
       config:
-        relstage: stable
+        relstage: deprecated
         urls:
           - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
             name: $P-${V_PKG}.zip