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 7dfb9a6  fixed update-cli
7dfb9a6 is described below

commit 7dfb9a660deacb9f2676ba1749072fb1d1d2afe3
Author: Michele Sciabarra <[email protected]>
AuthorDate: Wed Aug 7 15:53:42 2024 +0200

    fixed update-cli
---
 config/{nuvopts.txt => docopts.txt} |  2 +-
 config/{nuvfile.yml => opsfile.yml} |  0
 util/opsfile.yml                    | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/nuvopts.txt b/config/docopts.txt
similarity index 96%
rename from config/nuvopts.txt
rename to config/docopts.txt
index 2a4d05e..cf60838 100644
--- a/config/nuvopts.txt
+++ b/config/docopts.txt
@@ -7,7 +7,7 @@ Usage:
   config runtimes [<runtimesjson>]  
   config slack [--apiurl=<slackapiurl>] [--channel=<slackchannel>]
   config mail  [--mailuser=<mailuser>] [--mailpwd=<mailpwd>] 
[--mailfrom=<mailfrom>] [--mailto=<mailto>]
-  config volumes [--couchdb=<couchdb>] [--kafka=<kafka>] 
[--postgres=<postgres>] [--storage=<storage>] [--alerting=<alerting>] 
[--zookeeper=<zookeeper>] [--redis=<redis>] [--mongogb=<mongodb>]
+  config volumes [--couchdb=<couchdb>] [--kafka=<kafka>] [--pgvol=<postgres>] 
[--storage=<storage>] [--alerting=<alerting>] [--zookeeper=<zookeeper>] 
[--redisvol=<redis>] [--mongogb=<mongodb>]
   config controller [--javaopts=<javaopts>] [--loglevel=<loglevel>] 
[--replicas=<replicas>]
   config invoker [--javaopts=<javaopts>] [--poolmemory=<poolmemory>] 
[--timeoutsrun=<timeoutsrun>] [--timeoutslogs=<timeoutslogs>] 
[--loglevel=<loglevel>] [--replicas=<replicas>]
   config limits [--time=<time>] [--memory=<memory>] 
[--sequencelength=<sequencelength>] [--perminute=<perminute>] 
[--concurrent=<concurrent>] [--triggerperminute=<triggerperminute>] 
[--activation_max_payload=<activation_max_payload>]
diff --git a/config/nuvfile.yml b/config/opsfile.yml
similarity index 100%
rename from config/nuvfile.yml
rename to config/opsfile.yml
diff --git a/util/opsfile.yml b/util/opsfile.yml
index 1cddd5d..1e6f10a 100644
--- a/util/opsfile.yml
+++ b/util/opsfile.yml
@@ -1,5 +1,12 @@
 version: 3
 
+vars:
+  OS: "{{or .__OS OS}}"
+  ARCH: "{{or .__ARCH ARCH}}"
+  ARC: '{{if eq .OS "windows"}}.zip{{else}}.tar.gz{{end}}'
+  EXE: '{{if eq .OS "windows"}}.exe{{else}}{{end}}'
+  DRY: ""
+
 tasks:
 
   system:
@@ -11,7 +18,7 @@ tasks:
 
   update-cli:
     desc: update CLI
-    silent: true
+    silent: false
     vars:
        BASE: "https://github.com/apache/openserverless-cli/releases/download";
        VER:
@@ -21,9 +28,11 @@ tasks:
     cmds:
     - echo "Trying to update ops..."
     - curl -sL "{{.URL}}" -o "$OPS_TMP/{{.FILE}}"
-    - extract "$OPS_TMP/{{.FILE}}" "$OPS_TMP/ops{{.EXE}}"
     - |
-      if mv -v "$OPS_TMP/ops{{.EXE}}" "$OPS_CMD"
+      cd "$OPS_TMP"
+      extract "{{.FILE}}" "ops{{.EXE}}"
+    - |
+      if rename "$OPS_TMP/ops{{.EXE}}" "$OPS_CMD"
       then echo "ops updated!"
       else echo "cannot update ops - please execute 'ops util update-cli' as 
an administrator"
       fi

Reply via email to