diff --git a/ci/iscc b/ci/iscc index bcd6e88d67..5037668f26 100755 --- 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 index 704e641b6c..4efd895895 100755 --- 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)