mirror of
https://github.com/meeb/tubesync.git
synced 2025-06-25 06:26:37 +00:00
Used printf consistently
Specifically turn off flags to printf where none are intended. There are fewer things to keep in mind this way.
This commit is contained in:
parent
73037ecd60
commit
a60f68faf3
@ -29,8 +29,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \
|
|||||||
# Reminder: the SHELL handles all variables
|
# Reminder: the SHELL handles all variables
|
||||||
RUN decide_arch() { \
|
RUN decide_arch() { \
|
||||||
case "${TARGETARCH:=amd64}" in \
|
case "${TARGETARCH:=amd64}" in \
|
||||||
(arm64) printf 'aarch64' ;; \
|
(arm64) printf -- 'aarch64' ;; \
|
||||||
(*) printf '%s' "${TARGETARCH}" ;; \
|
(*) printf -- '%s' "${TARGETARCH}" ;; \
|
||||||
esac ; \
|
esac ; \
|
||||||
} && \
|
} && \
|
||||||
decide_expected() { \
|
decide_expected() { \
|
||||||
@ -88,7 +88,7 @@ RUN decide_arch() { \
|
|||||||
set -x && \
|
set -x && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get -y --no-install-recommends install locales && \
|
apt-get -y --no-install-recommends install locales && \
|
||||||
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
|
printf -- "en_US.UTF-8 UTF-8\n" > /etc/locale.gen && \
|
||||||
locale-gen en_US.UTF-8 && \
|
locale-gen en_US.UTF-8 && \
|
||||||
# Install required distro packages
|
# Install required distro packages
|
||||||
apt-get -y --no-install-recommends install curl ca-certificates binutils xz-utils && \
|
apt-get -y --no-install-recommends install curl ca-certificates binutils xz-utils && \
|
||||||
@ -205,7 +205,7 @@ RUN set -x && \
|
|||||||
# Append software versions
|
# Append software versions
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
FFMPEG_VERSION=$(/usr/local/bin/ffmpeg -version | head -n 1 | awk '{ print $3 }') && \
|
FFMPEG_VERSION=$(/usr/local/bin/ffmpeg -version | head -n 1 | awk '{ print $3 }') && \
|
||||||
echo "ffmpeg_version = '${FFMPEG_VERSION}'" >> /app/common/third_party_versions.py
|
printf -- "ffmpeg_version = '%s'\n" "${FFMPEG_VERSION}" >> /app/common/third_party_versions.py
|
||||||
|
|
||||||
# Copy root
|
# Copy root
|
||||||
COPY config/root /
|
COPY config/root /
|
||||||
|
Loading…
Reference in New Issue
Block a user