! use pipeline to avoid block caused by interactive

oldratlee · oldratlee · commit 1a95423cc3eb · 2021-11-10T15:02:54.000+08:00
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -78,7 +78,7 @@ versionGreatEqThan() {
 }
 
 logAndRun() {
-    blueEcho "Run under work directory $PWD :$nl$*"
+    blueEcho "Run under work directory $PWD :$nl$*" 1>&2
     time "$@"
 }
 
diff --git a/scripts/prepare-jdk.sh b/scripts/prepare-jdk.sh
@@ -28,7 +28,7 @@ __loadSdkman() {
     set +eEuo pipefail
     # shellcheck disable=SC1090
     source "$HOME/.sdkman/bin/sdkman-init.sh"
-    "$this_time_install_sdk_man" && logAndRun sdk ls java
+    "$this_time_install_sdk_man" && logAndRun sdk ls java | sed -n '/^ Vendor/,/^===========/p'
     set -eEuo pipefail
 }
 __loadSdkman

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ versionGreatEqThan() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`logAndRun() {`
`81`		`- blueEcho "Run under work directory $PWD :$nl$*"`
	`81`	`+ blueEcho "Run under work directory $PWD :$nl$*" 1>&2`
`82`	`82`	`time "$@"`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ __loadSdkman() {`
`28`	`28`	`set +eEuo pipefail`
`29`	`29`	`# shellcheck disable=SC1090`
`30`	`30`	`source "$HOME/.sdkman/bin/sdkman-init.sh"`
`31`		`- "$this_time_install_sdk_man" && logAndRun sdk ls java`
	`31`	`+ "$this_time_install_sdk_man" && logAndRun sdk ls java \| sed -n '/^ Vendor/,/^===========/p'`
`32`	`32`	`set -eEuo pipefail`
`33`	`33`	`}`
`34`	`34`	`__loadSdkman`