From 720a29b4bdcb59fbc47f50202a66cda5fa99365e Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Mon, 24 Feb 2025 16:38:00 +0400 Subject: [PATCH 1/4] download cryptomator from github remove failed MSIAfterburnerSetup --- Cryptomator/create_install.bat | 34 ++------------------- Cryptomator/create_install.sh | 34 +++++++++++++++++++++ MSIAfterburnerSetup/create_install.bat | 41 -------------------------- 3 files changed, 36 insertions(+), 73 deletions(-) create mode 100644 Cryptomator/create_install.sh delete mode 100644 MSIAfterburnerSetup/create_install.bat diff --git a/Cryptomator/create_install.bat b/Cryptomator/create_install.bat index 8abbb7ab..36b50a24 100644 --- a/Cryptomator/create_install.bat +++ b/Cryptomator/create_install.bat @@ -1,34 +1,4 @@ -@pushd "%~dp0" -@call "%~dp0..\.tools\env_tools.bat" - -set latest_version="https://cryptomator.org/downloads/win-msi/thanks" -echo Downloading: %latest_version% ... ->raw_download_str.tmp ( - %curl% --location %latest_version% | %grep% --only-matching "(?<=href="")[^\s]*\.msi(?="")" | %head% -n1 -) -if %errorlevel% neq 0 ( - echo Cannot get latest version - exit /b %errorlevel% -) - -set /p download_url=< raw_download_str.tmp -echo Downloading: '%download_url%' ... -%curl% --remote-name --location %download_url% -if %errorlevel% neq 0 ( - echo Cannot download latest version - exit /b %errorlevel% -) - -for %%i in (%download_url%) do ( - set latest_filename=%%~ni%%~xi -) - -echo Generating %latest_filename% autoinstall.bat -> autoinstall.bat ( - echo "%%~dp0%latest_filename%" /passive - echo exit /b %%errorlevel%% -) - -echo Done. +@echo off +"%~dp0..\.tools\busybox.exe" bash "%~dp0create_install.sh" exit /b %errorlevel% diff --git a/Cryptomator/create_install.sh b/Cryptomator/create_install.sh new file mode 100644 index 00000000..9106c484 --- /dev/null +++ b/Cryptomator/create_install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +dp0="$(realpath "$(dirname "$0")")" +dp0_tools="$dp0/../.tools" && source "$dp0_tools/env_tools.sh" +set -e +cd "$dp0" + +api_url='https://api.github.com/repos/cryptomator/cryptomator/releases?per_page=100' +echo Get latest version: "$api_url" ... +download_url=$($curl --silent --location "$api_url" | "$grep" --only-matching '(?<="browser_download_url":\s")[^,]+Cryptomator-[^,]+x64\.msi(?=")' | head -1) +[[ -z "$download_url" ]] && { + echo "Cannot get release version" + exit 1 +} + +echo "Downloading: $download_url ..." +$curl --location "$download_url" --remote-name + +echo Generating autoinstall ... +# shellcheck disable=SC2016 +{ + printf '#!/bin/bash +cd "$(realpath "$(dirname "$0")")" || exit 1 +set -v +msiexec.exe /i "%s" /passive +' "$(basename -- "$download_url")" +} >autoinstall.sh +chmod +x ./autoinstall.sh + +{ + printf '@echo off +"%%~dp0..\\.tools\\busybox.exe" bash "%%~dp0autoinstall.sh" +exit /b %%errorlevel%% +' +} >autoinstall.bat diff --git a/MSIAfterburnerSetup/create_install.bat b/MSIAfterburnerSetup/create_install.bat deleted file mode 100644 index aaf37cac..00000000 --- a/MSIAfterburnerSetup/create_install.bat +++ /dev/null @@ -1,41 +0,0 @@ -@pushd "%~dp0" -@call "%~dp0..\.tools\env_tools.bat" - -for /f "tokens=2 delims==" %%a in ('wmic OS Get localdatetime /value') do set "dt=%%a" -set "datestamp=%dt:~0,10%" - -set download_token_url="https://www.msi.com/api/v1/get_token?date=%datestamp%" -echo Downloading: %download_token_url% ... ->raw_download_str.tmp ( - %curl% --location %download_token_url% | %grep% --only-matching "(?<=\["")[^\s]*(?=""\])" | %head% -n1 -) -if %errorlevel% neq 0 ( - echo Cannot download_token - exit /b %errorlevel% -) - -set latest_filename=MSIAfterburnerSetup.zip -set /p download_token= < raw_download_str.tmp -call set download_token=%%download_token:\=%% -set download_url="https://download.msi.com/uti_exe/vga/%latest_filename%?__token__=%download_token%" -echo Downloading: %download_url% ... -%curl% --output %latest_filename% --location %download_url% -if %errorlevel% neq 0 ( - echo Cannot download latest version - exit /b %errorlevel% -) - -"%p7z%" e "%latest_filename%" "-o." *.exe -aoa -r -if %errorlevel% neq 0 ( exit /b %errorlevel% ) - -for /r . %%a in (MSIAfterburnerSetup*.exe) do set "latest_filepath=%%a" -for %%i in ("%latest_filepath%") do ( - set latest_filename=%%~ni%%~xi -) - -echo Generating %latest_filename% autoinstall.bat -echo "%%~dp0%latest_filename%" /S > autoinstall.bat - -echo Done. - -exit /b %errorlevel% From aaa161d319cea485c3310cb9751d295524a1951d Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Mon, 24 Feb 2025 16:44:41 +0400 Subject: [PATCH 2/4] +x --- Cryptomator/create_install.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Cryptomator/create_install.sh diff --git a/Cryptomator/create_install.sh b/Cryptomator/create_install.sh old mode 100644 new mode 100755 From f28a73ec43d05acb25c9ea0a64b4e82d43f16b96 Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Mon, 24 Feb 2025 16:50:27 +0400 Subject: [PATCH 3/4] checkoutv4 --- .github/workflows/mega-linter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 5e02ab3a..c1c15568 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -22,7 +22,7 @@ jobs: steps: # Git Checkout - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} fetch-depth: 0 @@ -42,7 +42,7 @@ jobs: # Upload MegaLinter artifacts - name: Archive production artifacts if: ${{ success() }} || ${{ failure() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: MegaLinter reports path: | From 879953ede2709f73a9b1198c3fd923c055fd86a5 Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Mon, 24 Feb 2025 16:51:29 +0400 Subject: [PATCH 4/4] 8.4.2 --- .github/workflows/mega-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index c1c15568..1acaa2b1 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -32,7 +32,7 @@ jobs: id: ml # You can override MegaLinter flavor used to have faster performances # More info at https://megalinter.github.io/flavors/ - uses: megalinter/megalinter@v7.9.0 + uses: megalinter/megalinter@v8.4.2 env: # All available variables are described in documentation # https://megalinter.github.io/configuration/