From 4460fb7004dce085ad122da2d0d12a50509af2f5 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Mon, 12 Jun 2017 21:09:59 +0200 Subject: [PATCH] docker-entrypoint.sh: fix shellcheck issues issues found by shellcheck were: ``` $ shellcheck docker-entrypoint.sh In docker-entrypoint.sh line 10: if [[ ${USERMAP_UID} != ${USERMAP_ORIG_UID} || ${USERMAP_GID} != ${USERMAP_ORIG_GID} ]]; then ^-- SC2053: Quote the rhs of != in [[ ]] to prevent glob matching. ^-- SC2053: Quote the rhs of != in [[ ]] to prevent glob matching. In docker-entrypoint.sh line 12: groupmod -g ${USERMAP_GID} paperless ^-- SC2086: Double quote to prevent globbing and word splitting. In docker-entrypoint.sh line 65: if dpkg -s "$pkg" 2>&1 > /dev/null; then ^-- SC2069: The order of the 2>&1 and the redirect matters. The 2>&1 has to be last. In docker-entrypoint.sh line 69: if ! apt-cache show "$pkg" 2>&1 > /dev/null; then ^-- SC2069: The order of the 2>&1 and the redirect matters. The 2>&1 has to be last. ``` --- scripts/docker-entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 09c4168f8..60b369cae 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -7,9 +7,9 @@ map_uidgid() { USERMAP_ORIG_UID=$(id -g paperless) USERMAP_GID=${USERMAP_GID:-${USERMAP_UID:-$USERMAP_ORIG_GID}} USERMAP_UID=${USERMAP_UID:-$USERMAP_ORIG_UID} - if [[ ${USERMAP_UID} != ${USERMAP_ORIG_UID} || ${USERMAP_GID} != ${USERMAP_ORIG_GID} ]]; then + if [[ ${USERMAP_UID} != "${USERMAP_ORIG_UID}" || ${USERMAP_GID} != "${USERMAP_ORIG_GID}" ]]; then echo "Mapping UID and GID for paperless:paperless to $USERMAP_UID:$USERMAP_GID" - groupmod -g ${USERMAP_GID} paperless + groupmod -g "${USERMAP_GID}" paperless sed -i -e "s|:${USERMAP_ORIG_UID}:${USERMAP_GID}:|:${USERMAP_UID}:${USERMAP_GID}:|" /etc/passwd fi } @@ -62,11 +62,11 @@ install_languages() { # Loop over languages to be installed for lang in "${langs[@]}"; do pkg="tesseract-ocr-$lang" - if dpkg -s "$pkg" 2>&1 > /dev/null; then + if dpkg -s "$pkg" > /dev/null 2>&1; then continue fi - if ! apt-cache show "$pkg" 2>&1 > /dev/null; then + if ! apt-cache show "$pkg" > /dev/null 2>&1; then continue fi