Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NiceGuyIT committed May 21, 2023
2 parents 33455a8 + d14e3e9 commit bb80fc5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
22 changes: 13 additions & 9 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@ env:
# Otherwise, the user's bin directory is used.
# Task treats environmental variables as case-sensitive while Windows does not.
sh: |
{{- if eq OS "windows" -}}
if net session >/dev/null 2>&1; then
echo '{{.ProgramData}}\taskfiles\bin'
else
echo '{{.USERPROFILE}}\bin'
fi
{{- else -}}
echo '{{ if eq .USER "root" }}/usr/local/bin{{ else }}{{ .HOME }}/bin{{ end }}'
{{- end -}}
if [ -z $TASKFILE_BIN_DIR ]; then
{{ if eq OS "windows" -}}
if net session >/dev/null 2>&1; then
echo '{{.ProgramData}}\taskfiles\bin'
else
echo '{{.USERPROFILE}}\bin'
fi
{{- else -}}
echo '{{ if eq .USER "root" }}/usr/local/bin{{ else }}{{ .HOME }}/bin{{ end }}'
{{- end }}
else
echo $TASKFILE_BIN_DIR
fi
# Include all the tasks at the top level, so they can include tasks in other files. If the tasks are included in the
# sub-files, the tasks are repeated in the 'task --list' output. Including all tasks at the top level prevents this
Expand Down
2 changes: 0 additions & 2 deletions install/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ These are the list of packages that can be installed.
## Other Package Managers

- [Webi][]
- [Rust command line utilities][]
- [Command line utilities][]
- [curated list of command-line utilities written in Rust][]
- [Awesome Alternatives in Rust][]
- [Modern Unix][]

[Webi]: https://webinstall.dev/
[Rust command line utilities]: https://github.com/sts10/rust-command-line-utilities
[Command line utilities]: https://lib.rs/command-line-utilities
[curated list of command-line utilities written in Rust]: https://github.com/sts10/rust-command-line-utilities
[Awesome Alternatives in Rust]: https://github.com/TaKO8Ki/awesome-alternatives-in-rust
Expand Down
2 changes: 1 addition & 1 deletion install/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ tasks:
OWNER: junegunn
# .ARCH needs to be defined here because ASSET_PATTERN is evaluated before calling the task.
ARCH: '{{.ARCH | default ARCH}}'
COMPRESS_EXT: '.zip'
COMPRESS_EXT: '{{ if or (eq OS "windows") (eq OS "darwin") }}.zip{{ else }}.tar.gz{{ end }}'
SEMVER_REGEX: 'v?[0-9]+\.([0-9]+\.?){1,}'
cmds:
- task: :github:download
Expand Down

0 comments on commit bb80fc5

Please sign in to comment.