chore: update ci/iscc

- Fix container CLI detection Signed-off-by: Hiroshi Miura <[email protected]>
omegat-org · Jun 2, 2024 · 2792b1c · 2792b1c
1 parent 14817a5
commit 2792b1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ci/iscc b/ci/iscc
@@ -37,8 +37,7 @@ WORKDIR /work
 ENTRYPOINT ["iscc"]
 __EOF__
 
-CMD="$(type -p docker)" || [[ -e $CMD ]] && $CMD info >/dev/null 2>&1 || CMD="$(type -p nerdctl)"
-$CMD info > /dev/null || false
+CMD="$(type -p docker)" && $CMD info >/dev/null 2>&1 || CMD="$(type -p nerdctl)" && $CMD info > /dev/null || false
 echo Select container CLI: $CMD
 
 IMAGEID=$($CMD images -q $IMAGE)

diff --git a/ci/osslsigncode b/ci/osslsigncode
@@ -15,9 +15,8 @@ bindpaths() {
     done
 }
 
-CMD="$(type -p docker)" || [[ -e $CMD ]] && $CMD info >/dev/null 2>1 || CMD="$(type -p nerdctl)"
-echo select container CLI: $CMD
-$CMD info || false
+CMD="$(type -p docker)" && $CMD info >/dev/null 2>1 || CMD="$(type -p nerdctl)" && $CMD info >/dev/null || false
+echo Select container CLI: $CMD
 
 # build container image
 CTX=$(mktemp -d)