Skip to content

Commit bb80fc5

Browse files
committed
Merge branch 'develop'
2 parents 33455a8 + d14e3e9 commit bb80fc5

3 files changed

Lines changed: 14 additions & 12 deletions

File tree

Taskfile.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@ env:
77
# Otherwise, the user's bin directory is used.
88
# Task treats environmental variables as case-sensitive while Windows does not.
99
sh: |
10-
{{- if eq OS "windows" -}}
11-
if net session >/dev/null 2>&1; then
12-
echo '{{.ProgramData}}\taskfiles\bin'
13-
else
14-
echo '{{.USERPROFILE}}\bin'
15-
fi
16-
{{- else -}}
17-
echo '{{ if eq .USER "root" }}/usr/local/bin{{ else }}{{ .HOME }}/bin{{ end }}'
18-
{{- end -}}
10+
if [ -z $TASKFILE_BIN_DIR ]; then
11+
{{ if eq OS "windows" -}}
12+
if net session >/dev/null 2>&1; then
13+
echo '{{.ProgramData}}\taskfiles\bin'
14+
else
15+
echo '{{.USERPROFILE}}\bin'
16+
fi
17+
{{- else -}}
18+
echo '{{ if eq .USER "root" }}/usr/local/bin{{ else }}{{ .HOME }}/bin{{ end }}'
19+
{{- end }}
20+
else
21+
echo $TASKFILE_BIN_DIR
22+
fi
1923
2024
# Include all the tasks at the top level, so they can include tasks in other files. If the tasks are included in the
2125
# sub-files, the tasks are repeated in the 'task --list' output. Including all tasks at the top level prevents this

install/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@ These are the list of packages that can be installed.
4444
## Other Package Managers
4545

4646
- [Webi][]
47-
- [Rust command line utilities][]
4847
- [Command line utilities][]
4948
- [curated list of command-line utilities written in Rust][]
5049
- [Awesome Alternatives in Rust][]
5150
- [Modern Unix][]
5251

5352
[Webi]: https://webinstall.dev/
54-
[Rust command line utilities]: https://github.com/sts10/rust-command-line-utilities
5553
[Command line utilities]: https://lib.rs/command-line-utilities
5654
[curated list of command-line utilities written in Rust]: https://github.com/sts10/rust-command-line-utilities
5755
[Awesome Alternatives in Rust]: https://github.com/TaKO8Ki/awesome-alternatives-in-rust

install/Taskfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ tasks:
335335
OWNER: junegunn
336336
# .ARCH needs to be defined here because ASSET_PATTERN is evaluated before calling the task.
337337
ARCH: '{{.ARCH | default ARCH}}'
338-
COMPRESS_EXT: '.zip'
338+
COMPRESS_EXT: '{{ if or (eq OS "windows") (eq OS "darwin") }}.zip{{ else }}.tar.gz{{ end }}'
339339
SEMVER_REGEX: 'v?[0-9]+\.([0-9]+\.?){1,}'
340340
cmds:
341341
- task: :github:download

0 commit comments

Comments
 (0)