diff --git a/rsync-git/install.ps1 b/rsync-git/install.ps1 index 5f002947..af3529f9 100644 --- a/rsync-git/install.ps1 +++ b/rsync-git/install.ps1 @@ -66,13 +66,9 @@ function Add-SystemPathValue{ $base_url = "https://repo.msys2.org/msys/x86_64" # Do we need to break out the other 2 into their own repos? $rsync_file = "rsync-$Version-x86_64.pkg.tar.zst" -$rsync_dir = "rsync-$Version-x86_64.pkg" $libxxhash_file = "libxxhash-0.8.2-1-x86_64.pkg.tar.zst" -$libxxhash_dir = "libxxhash-0.8.2-1-x86_64.pkg" $libzstd_file = "libzstd-1.5.5-1-x86_64.pkg.tar.zst" -$libzstd_dir = "libzstd-1.5.5-1-x86_64.pkg" $files = $rsync_file, $libxxhash_file, $libzstd_file -$dirs = $rsync_dir, $libxxhash_dir, $libzstd_dir $date = Get-Date -Format "yyyyMMdd" $7z_bin = "$env:ProgramFiles\7-Zip-Zstandard\7z.exe" $git_bin_dir = "$env:ProgramFiles\Git\usr\bin" diff --git a/rsync-git/readme.md b/rsync-git/readme.md index 69043b70..7c678139 100644 --- a/rsync-git/readme.md +++ b/rsync-git/readme.md @@ -4,7 +4,7 @@ rSync Git Package Definition rSync is an optional tool in msys2. A standard git installation contains the standard msys2 tools. Optional tools can be downloaded and placed in the ``usr\bin`` directory in the git installation. Therefore, this package -definition depends on an existing git installation. +definition depends on an existing git installation of at least version 2.41.0.1. Additionally, the rSync package itself is a ``tar.zst`` file and cannot be unzipped natively in Windows. It requires a tool like 7-zip with Z-Standard @@ -12,18 +12,15 @@ support, such as https://github.com/mcmilk/7-Zip-zstd. Therefore, this package depends on an existing 7-zip-zstd installation. ```yaml -install_git: +install_rsync_deps: pkg.installed: - - name: git + - pkgs: + - 7zip-zstd + - git: '>=2.41.0.1' -install_7zip-zstd: - pkg.installed: - - name: 7zip-zstd - install_rsync-git: pkg.installed: - name: rsync-git - require: - - pkg: install_git - - pkg: install_7zip-zstd + - pkg: install_rsync_deps ```