Skip to content

Commit

Permalink
Fix: Cross platform installs
Browse files Browse the repository at this point in the history
  • Loading branch information
NiceGuyIT committed May 19, 2023
1 parent 7d796e1 commit 5888547
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
ask files for use with [task][]. There's a repo that has [advanced examples][].
# Taskfiles

A collection of task files for use with [task][]. There's a repo that has [advanced examples][].

[task]: https://github.com/go-task/task

Expand Down
4 changes: 2 additions & 2 deletions install/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ These are the list of packages that can be installed.
- [coreutils][] - Part of the core install
- [age][]
- [age-keygen][]
- [alacritty][] - Windows may require [Universal CRT][] installed
- [alacritty][] - Requires [Microsoft Visual C++ Redistributable][] installed: `choco install vcredist140`
- [atuin][]
- [cfssl-certinfo][]
- [docker compose][] (Linux only)
Expand Down Expand Up @@ -37,9 +37,9 @@ These are the list of packages that can be installed.
[sops]: https://github.com/mozilla/sops
[starship]: https://github.com/starship/starship
[task]: https://github.com/go-task/task
[Universal CRT]: https://github.com/MicrosoftDocs/cpp-docs/blob/main/docs/windows/universal-crt-deployment.md
[xh]: https://github.com/ducaale/xh
[yq]: https://github.com/mikefarah/yq
[Microsoft Visual C++ Redistributable]: https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170

## Other Package Managers

Expand Down
10 changes: 9 additions & 1 deletion install/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ tasks:
ARCH: '{{.ARCH}}',
COMPRESS_EXT: '{{.COMPRESS_EXT}}',
ASSET_DIR: 'true',
ASSET_PATTERN: '{{.NAME}}-*-{{.ARCH}}-*-{{OS}}{{ if eq OS "linux" }}-musl{{ end }}{{.COMPRESS_EXT}}'
ASSET_PATTERN: '{{.NAME}}-*-{{.ARCH}}-*-{{OS}}{{ if eq OS "linux" }}-musl{{ else if eq OS "windows" }}-gnu{{ end }}{{.COMPRESS_EXT}}'
}
status:
# Note: This explicitly checks if the file is in BIN_DIR. This means multiple versions can be installed, one in
Expand Down Expand Up @@ -454,6 +454,14 @@ tasks:
ASSET_PATTERN: '{{.NAME}}-*-{{.ARCH}}-*-{{OS}}{{ if eq OS "linux"}}-musl{{ end }}{{.COMPRESS_EXT}}'
}
platforms: [linux, darwin]
- cmd: |
task --silent github:download \
NAME={{ squote .NAME }} \
OWNER={{ squote .OWNER }} \
ARCH={{ squote .ARCH }} \
COMPRESS_EXT={{ squote .COMPRESS_EXT }} \
ASSET_PATTERN='{{.NAME}}-*-{{.ARCH}}-*-{{OS}}{{ if eq OS "linux"}}-musl{{ end }}{{.COMPRESS_EXT}}'
platforms: [linux, darwin]
- cmd: |
echo "Windows is not supported"
platforms: [windows]
Expand Down

0 comments on commit 5888547

Please sign in to comment.