This is an automated email from the ASF dual-hosted git repository.
msciabarra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
The following commit(s) were added to refs/heads/main by this push:
new d2f9982 fixes
d2f9982 is described below
commit d2f998277c6153e5637290ae69c27a0b666a23dd
Author: Michele Sciabarra <[email protected]>
AuthorDate: Thu Aug 1 04:33:12 2024 +0200
fixes
---
prereq.yml | 16 ++++++++--------
tests/nuvfile.yml | 4 ++++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/prereq.yml b/prereq.yml
index 0ad9c4a..a534f75 100644
--- a/prereq.yml
+++ b/prereq.yml
@@ -28,12 +28,12 @@ tasks:
- |
{{if eq .OS "windows"}}
7zz e -r -aoa -o. "{{.FILE}}" "{{.OUT}}.exe"
- rm "{{.FILE}}"
+ remove "{{.FILE}}"
{{else}}
7zz e "{{.FILE}}" -o.
- rm "{{.FILE}}"
+ remove "{{.FILE}}"
7zz e -r -aoa -o. "{{.FILETAR}}" "{{.OUT}}"
- rm "{{.FILETAR}}"
+ remove "{{.FILETAR}}"
{{end}}
download:
@@ -43,8 +43,8 @@ tasks:
- OUT
cmds:
- curl -sL -ccookie.txt -o"{{.OUT}}" "{{.URL}}"
- - '{{if eq .OS "windows"}}mv {{.OUT}} {{.OUT}}.exe{{else}}chmod +x
{{.OUT}}{{end}}'
- - rm cookie.txt
+ - '{{if eq .OS "windows"}}rename {{.OUT}} {{.OUT}}.exe{{else}}chmod +x
{{.OUT}}{{end}}'
+ - remove cookie.txt
7zz:
desc: 7zr
@@ -65,9 +65,9 @@ tasks:
- curl -sL "{{.URL}}" -o "{{.FILE}}"
- |
if test "{{.OS}}" == "windows"
- then mv 7zr.exe 7zz.exe
+ then rename 7zr.exe 7zz.exe
else tar xJvf "{{.FILE}}" 7zz
- rm "{{.FILE}}"
+ remove "{{.FILE}}"
fi
coreutils:
@@ -106,7 +106,7 @@ tasks:
- echo "{{.URL}}"
- curl -sL "{{.URL}}" -o "{{.FILE}}"
- 7zz e -r -aoa -o. {{.FILE}} bun{{.EXE}}
- - rm "{{.FILE}}"
+ - remove "{{.FILE}}"
kubectl:
vars:
diff --git a/tests/nuvfile.yml b/tests/nuvfile.yml
index 5c00612..16190a9 100644
--- a/tests/nuvfile.yml
+++ b/tests/nuvfile.yml
@@ -47,3 +47,7 @@ tasks:
desc: k3sup test
cmds:
- echo k3sup $(k3sup version | grep 'Version:')
+
+ tools:
+ - rename
+ - remove
