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

commit c8009d99dcd077ac06bcc9e90da986c5c6e77a03
Author: Michele Sciabarra <[email protected]>
AuthorDate: Tue Jun 24 15:25:39 2025 +0100

    windowsification
---
 setup/nuvolaris/opsfile.yml                                 |  11 ++++++++++-
 setup/{ => nuvolaris}/web/discord.png                       | Bin
 setup/{ => nuvolaris}/web/index.html                        |   2 +-
 setup/{ => nuvolaris}/web/linkedin.png                      | Bin
 .../{ => nuvolaris}/web/os-logo-full-vertical-bg-white.png  | Bin
 setup/opsfile.yml                                           |  12 ------------
 setup/web/TODO                                              |   7 -------
 util/opsfile.yml                                            |   9 ++++-----
 8 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/setup/nuvolaris/opsfile.yml b/setup/nuvolaris/opsfile.yml
index 60d91bc..952beaa 100644
--- a/setup/nuvolaris/opsfile.yml
+++ b/setup/nuvolaris/opsfile.yml
@@ -230,6 +230,11 @@ tasks:
   delete:
     desc: no-op delete command
 
+
+  boh:
+    cmds:
+    - realpath web
+
   add-user:
     silent: true
     desc: create a new U=user (default 'devel') with P=password, (default a 
random pw)
@@ -255,8 +260,12 @@ tasks:
     - echo "Creating user {{.USR}} in $APIHOST"
     - |
       ops admin adduser "{{.USR}}" "{{.USR}}@example.com" '{{.PSW}}' --all
-      sleep 5      
+      sleep 15
     - |
       export OPS_PASSWORD="{{.PSW}}"
       retry ops ide login {{.USR}} "$APIHOST"
     - echo "{{.PSW}}" > ~/.ops/{{.USR}}.password
+    - ops util upload "$(realpath web)"
+    - echo "Login with:" ops ide login {{.USR}} https://miniops.me
+    - echo "Password is saved in:" ~/.ops/{{.USR}}.password
+    - echo "Web URL is:" "$HOST"
diff --git a/setup/web/discord.png b/setup/nuvolaris/web/discord.png
similarity index 100%
rename from setup/web/discord.png
rename to setup/nuvolaris/web/discord.png
diff --git a/setup/web/index.html b/setup/nuvolaris/web/index.html
similarity index 99%
rename from setup/web/index.html
rename to setup/nuvolaris/web/index.html
index 7a1fdc6..5a6b8e3 100644
--- a/setup/web/index.html
+++ b/setup/nuvolaris/web/index.html
@@ -87,7 +87,7 @@
 </head>
 
 <body>
-
+    <h1>Welcome to</h1>
     <img src="os-logo-full-vertical-bg-white.png" alt="OpenServerless Logo" />
 
     <div class="button-row">
diff --git a/setup/web/linkedin.png b/setup/nuvolaris/web/linkedin.png
similarity index 100%
rename from setup/web/linkedin.png
rename to setup/nuvolaris/web/linkedin.png
diff --git a/setup/web/os-logo-full-vertical-bg-white.png 
b/setup/nuvolaris/web/os-logo-full-vertical-bg-white.png
similarity index 100%
rename from setup/web/os-logo-full-vertical-bg-white.png
rename to setup/nuvolaris/web/os-logo-full-vertical-bg-white.png
diff --git a/setup/opsfile.yml b/setup/opsfile.yml
index fc82ab6..269647e 100644
--- a/setup/opsfile.yml
+++ b/setup/opsfile.yml
@@ -101,18 +101,6 @@ tasks:
       - $OPS config apihost miniops.me --protocol=http
       - $OPS setup devcluster
       - $OPS setup nuvolaris add-user
-      - |
-        export OPS_PASSWORD="$(cat ~/.ops/devel.password)"
-        ops ide login devel http://miniops.me
-        ops util upload $(realpath web)
-      - |
-        $OPS setup nuvolaris add-user
-        export OPS_PASSWORD="$(cat ~/.ops/devel.password)"
-        $OPS ide login devel http://miniops.me
-        $OPS util upload "$(realpath web)"
-      - echo "Login with:" ops ide login devel https://miniops.me
-      - echo "Password is saved in:" ~/.ops/devel.password
-      - echo "Web URL is:" "http://devel.miniops.me";
 
   devcluster:
     vars:
diff --git a/setup/web/TODO b/setup/web/TODO
deleted file mode 100644
index 6fa2cb2..0000000
--- a/setup/web/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-Welcome to Apache OpenServerless
-
-Join Us on Discord
-
-Share on Linkedin
-
-Install with
diff --git a/util/opsfile.yml b/util/opsfile.yml
index f05197f..8570da5 100644
--- a/util/opsfile.yml
+++ b/util/opsfile.yml
@@ -193,21 +193,20 @@ tasks:
         then ARGS="--batchsize={{.__batchsize}}"
         else ARGS="$ARGS --batchsize=5"
         fi
-        bun upload.js $FOLDER_PATH $ARGS
+        bun upload.js "$FOLDER_PATH" $ARGS
     env:
       FOLDER_PATH:
         sh: |
-          P="$($OPS -opspath ./)"
           if test -n "{{._folder_}}" 
-          then P="$($OPS -opspath {{._folder_}})"
+          then opspath "{{._folder_}}"
+          else opspath .
           fi
-          echo $P
 
   clean:
     silent: true
     cmds:
       - |
-        bun upload.js $FOLDER_PATH --clean
+        bun upload.js "$FOLDER_PATH" --clean
     env:
       FOLDER_PATH:
         sh: |

Reply via email to