From fd17d0718ac87949b0812361303cd736e394b1cf Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 30 Jan 2025 22:45:15 +0300
Subject: [PATCH] Move s3cmd installation to before_install, fix extra slash in
 destination

---
 .gitlab-ci.yml           | 3 +--
 CI/before_install.osx.sh | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 100b6ce2eb..c910a0c4ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -510,7 +510,6 @@ Ubuntu_GCC_integration_tests_asan:
     - CI/before_script.osx.sh
     - cd build; make -j $(sysctl -n hw.logicalcpu) package
     - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
-    - brew install s3cmd
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
         echo "[default]" > ~/.s3cfg
@@ -522,7 +521,7 @@ Ubuntu_GCC_integration_tests_asan:
 
         artifactDirectory="${CI_PROJECT_NAMESPACE//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_REF_NAME//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_SHORT_SHA//[\"<>|$'\t'\/\\?*]/_}-${CI_JOB_ID//[\"<>|$'\t'\/\\?*]/_}/"
         for dmg in *.dmg; do
-          s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}/
+          s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
         done
       fi
     - ccache -s
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 0120c55202..d73399c102 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -7,7 +7,7 @@ export HOMEBREW_AUTOREMOVE=1
 brew tap --repair
 brew update --quiet
 
-brew install curl xquartz gd fontconfig freetype harfbuzz brotli
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd
 
 command -v ccache >/dev/null 2>&1 || brew install ccache
 command -v cmake >/dev/null 2>&1 || brew install cmake