diff --git a/Makefile b/Makefile index 78bd476..079e8c2 100755 --- a/Makefile +++ b/Makefile @@ -209,13 +209,13 @@ binfmt-register: .PHONY: version version: - @if printf -- '%s' '$(IMAGE_VERSION)' | grep -q '^v[0-9]\{1,\}$$'; then \ + @if printf '%s' '$(IMAGE_VERSION)' | grep -q '^v[0-9]\{1,\}$$'; then \ NEW_IMAGE_VERSION=$$(awk -v 'v=$(IMAGE_VERSION)' 'BEGIN {printf "v%.0f", substr(v,2)+1}'); \ - printf -- '%s\n' "$${NEW_IMAGE_VERSION:?}" > '$(VERSION_FILE)'; \ + printf '%s\n' "$${NEW_IMAGE_VERSION:?}" > '$(VERSION_FILE)'; \ '$(GIT)' add '$(VERSION_FILE)'; '$(GIT)' commit -m "$${NEW_IMAGE_VERSION:?}"; \ '$(GIT)' tag -a "$${NEW_IMAGE_VERSION:?}" -m "$${NEW_IMAGE_VERSION:?}"; \ else \ - >&2 printf -- 'Malformed version string: %s\n' '$(IMAGE_VERSION)'; \ + >&2 printf 'Malformed version string: %s\n' '$(IMAGE_VERSION)'; \ exit 1; \ fi diff --git a/run-with-xdummy.sh b/run-with-xdummy.sh index 4eb6946..574c1ee 100755 --- a/run-with-xdummy.sh +++ b/run-with-xdummy.sh @@ -17,26 +17,26 @@ containerExists() { "${DOCKER:?}" ps -af name="${1:?}" --format '{{.Names}}' | g containerIsRunning() { "${DOCKER:?}" ps -f name="${1:?}" --format '{{.Names}}' | grep -Fxq "${1:?}"; } if ! imageExists "${IMAGE_NAME:?}" && ! imageExists "${IMAGE_NAME#docker.io/}"; then - >&2 printf -- '%s\n' "\"${IMAGE_NAME:?}\" image doesn't exist!" + >&2 printf '%s\n' "\"${IMAGE_NAME:?}\" image doesn't exist!" exit 1 fi if containerIsRunning "${CONTAINER_NAME:?}"; then - printf -- '%s\n' "Stopping \"${CONTAINER_NAME:?}\" container..." + printf '%s\n' "Stopping \"${CONTAINER_NAME:?}\" container..." "${DOCKER:?}" stop "${CONTAINER_NAME:?}" >/dev/null fi if containerExists "${CONTAINER_NAME:?}"; then - printf -- '%s\n' "Removing \"${CONTAINER_NAME:?}\" container..." + printf '%s\n' "Removing \"${CONTAINER_NAME:?}\" container..." "${DOCKER:?}" rm "${CONTAINER_NAME:?}" >/dev/null fi CONTAINER_DEVICES=$(find /dev/ -mindepth 1 -maxdepth 1 \ '(' -name 'tty*' -or -name 'dri' -or -name 'vga_arbiter' -or -name 'nvidia*' -or -name 'nvhost*' -or -name 'nvmap' ')' \ - -exec printf -- '--device %s:%s\n' '{}' '{}' ';' \ + -exec printf '--device %s:%s\n' '{}' '{}' ';' \ ) -printf -- '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." +printf '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." # shellcheck disable=SC2086 "${DOCKER:?}" run \ --name "${CONTAINER_NAME:?}" \ @@ -49,5 +49,5 @@ printf -- '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." ${CONTAINER_DEVICES?} \ "${IMAGE_NAME:?}" "$@" >/dev/null -printf -- '%s\n\n' 'Done!' +printf '%s\n\n' 'Done!' exec "${DOCKER:?}" logs -f "${CONTAINER_NAME:?}" diff --git a/run.sh b/run.sh index fcf43e9..f23d589 100755 --- a/run.sh +++ b/run.sh @@ -17,26 +17,26 @@ containerExists() { "${DOCKER:?}" ps -af name="${1:?}" --format '{{.Names}}' | g containerIsRunning() { "${DOCKER:?}" ps -f name="${1:?}" --format '{{.Names}}' | grep -Fxq "${1:?}"; } if ! imageExists "${IMAGE_NAME:?}" && ! imageExists "${IMAGE_NAME#docker.io/}"; then - >&2 printf -- '%s\n' "\"${IMAGE_NAME:?}\" image doesn't exist!" + >&2 printf '%s\n' "\"${IMAGE_NAME:?}\" image doesn't exist!" exit 1 fi if containerIsRunning "${CONTAINER_NAME:?}"; then - printf -- '%s\n' "Stopping \"${CONTAINER_NAME:?}\" container..." + printf '%s\n' "Stopping \"${CONTAINER_NAME:?}\" container..." "${DOCKER:?}" stop "${CONTAINER_NAME:?}" >/dev/null fi if containerExists "${CONTAINER_NAME:?}"; then - printf -- '%s\n' "Removing \"${CONTAINER_NAME:?}\" container..." + printf '%s\n' "Removing \"${CONTAINER_NAME:?}\" container..." "${DOCKER:?}" rm "${CONTAINER_NAME:?}" >/dev/null fi CONTAINER_DEVICES=$(find /dev/ -mindepth 1 -maxdepth 1 \ '(' -name 'dri' -or -name 'vga_arbiter' -or -name 'nvidia*' -or -name 'nvhost*' -or -name 'nvmap' ')' \ - -exec printf -- '--device %s:%s\n' '{}' '{}' ';' \ + -exec printf '--device %s:%s\n' '{}' '{}' ';' \ ) -printf -- '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." +printf '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." # shellcheck disable=SC2086 "${DOCKER:?}" run \ --name "${CONTAINER_NAME:?}" \ @@ -48,5 +48,5 @@ printf -- '%s\n' "Creating \"${CONTAINER_NAME:?}\" container..." ${CONTAINER_DEVICES?} \ "${IMAGE_NAME:?}" "$@" >/dev/null -printf -- '%s\n\n' 'Done!' +printf '%s\n\n' 'Done!' exec "${DOCKER:?}" logs -f "${CONTAINER_NAME:?}"