From 7c50da970bad1d0cc8f3cbd116d68d72065b9107 Mon Sep 17 00:00:00 2001
From: HUMORCE <HUMORCE@outlook.com>
Date: Tue, 1 Aug 2023 05:58:53 +0000
Subject: [PATCH] aws-sam-cli@1.94.0: Fix extraction (Closes #4980)

---
 bucket/aws-sam-cli.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bucket/aws-sam-cli.json b/bucket/aws-sam-cli.json
index bec5c1d9d0..b4a9fad6a2 100644
--- a/bucket/aws-sam-cli.json
+++ b/bucket/aws-sam-cli.json
@@ -3,16 +3,22 @@
     "description": "Build, test, debug, and deploy Serverless applications from CLI",
     "homepage": "https://aws.amazon.com/serverless/sam/",
     "license": "Apache-2.0",
+    "depends": "lessmsi",
     "suggest": {
         "AWS CLI": "aws"
     },
     "architecture": {
         "64bit": {
-            "url": "https://github.com/aws/aws-sam-cli/releases/download/v1.94.0/AWS_SAM_CLI_64_PY3.msi",
+            "url": "https://github.com/aws/aws-sam-cli/releases/download/v1.94.0/AWS_SAM_CLI_64_PY3.msi_",
             "hash": "92bb9364aab6dd394ebf003b887e49bc26bc0a83de1546db688672167743a4d4"
         }
     },
-    "extract_dir": "Amazon\\AWSSAMCLI",
+    "pre_install": [
+        "# Workaround for #4980",
+        "Invoke-ExternalCommand lessmsi -ArgumentList @('x', \"$dir\\$fname\", \"$dir\\\") -Quiet",
+        "movedir \"$dir\\SourceDir\\Amazon\\AWSSAMCLI\" \"$dir\"",
+        "Remove-Item \"$dir\\SourceDir\", \"$dir\\$fname\" -Force -Recurse"
+    ],
     "bin": [
         "bin\\sam.cmd",
         [
@@ -26,7 +32,7 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/aws/aws-sam-cli/releases/download/v$version/AWS_SAM_CLI_64_PY3.msi"
+                "url": "https://github.com/aws/aws-sam-cli/releases/download/v$version/AWS_SAM_CLI_64_PY3.msi_"
             }
         },
         "hash": {