kludged script update to demo

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
operator-framework · Nov 16, 2023 · 96d157e · 96d157e
1 parent a7cd270
commit 96d157e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/docs/demo.gif b/docs/demo.gif
diff --git a/hack/scripts/generate-asciidemo.sh b/hack/scripts/generate-asciidemo.sh
@@ -29,17 +29,22 @@ function run() {
 
     # port forward the catalogd-catalogserver service
     typeline -x "# port forward the catalogd-catalogserver service to interact with the HTTP server serving catalog contents"
-    typline "kubectl -n catalogd-system port-forward svc/catalogd-catalogserver 8080:80"
+    typeline -x "kubectl -n catalogd-system port-forward svc/catalogd-catalogserver 8080:80"
+    (kubectl -n catalogd-system port-forward svc/catalogd-catalogserver 8080:80)&
 
     # inspect packages
     typeline -x "# check what 'packages' are available in this catalog"
-    typeline "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.package\") | .name'"
+    typeline -x "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.package\") | .name'"
+    curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == "olm.package") | .name'
     # inspect channels
     typeline -x "# check what channels are included in the wavefront package"
-    typeline "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.channel\") | select(.package == \"wavefront\") | .name'"
+    typeline -x "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.channel\") | select(.package == \"wavefront\") | .name'"
+    curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == "olm.channel") | select(.package == "wavefront") | .name'
     # inspect bundles
     typeline -x "# check what bundles are included in the wavefront package"
-    typeline "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.bundle\") | select(.package == \"ack-acm-controller\") | .name'"
+    typeline -x "curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == \"olm.bundle\") | select(.package == \"ack-acm-controller\") | .name'"
+    curl http://localhost:8080/catalogs/operatorhubio/all.json | jq -s '.[] | select(.schema == "olm.bundle") | select(.package == "ack-acm-controller") | .name'
 }
 
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
 run