From 9a7bca01c7285d1c72aff3651cd87b9c825e244f Mon Sep 17 00:00:00 2001 From: peterfromthehill Date: Tue, 15 Sep 2020 10:48:43 +0200 Subject: [PATCH] Allow to install extra packages (#440) * Allow to install extra packages The string in line #20 is always zero, we should watch the return value of mkdir. * fix more mkdir checks Co-authored-by: peterfromthehill --- core/start-service.sh | 2 +- kdav/start.sh | 2 +- webapp/start.sh | 2 +- zpush/start.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/start-service.sh b/core/start-service.sh index 90eeb1f..59004ff 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -32,7 +32,7 @@ if [ "${AUTOCONFIGURE}" == true ]; then # Hint: this is not compatible with a read-only container. # The general recommendation is to already build a container that has all required packages installed. ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"') - if [ -n "$(mkdir -p "/var/lib/apt/lists/" 2&> /dev/null)" ]; then + if mkdir -p "/var/lib/apt/lists/" 2&> /dev/null; then [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do # shellcheck disable=SC2016 disable=SC2086 diff --git a/kdav/start.sh b/kdav/start.sh index 9a6e495..525be4b 100755 --- a/kdav/start.sh +++ b/kdav/start.sh @@ -14,7 +14,7 @@ if [ "${AUTOCONFIGURE}" == true ]; then # Hint: this is not compatible with a read-only container. # The general recommendation is to already build a container that has all required packages installed. ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"') - if [ -n "$(mkdir -p "/var/lib/apt/lists/" 2&> /dev/null)" ]; then + if mkdir -p "/var/lib/apt/lists/" 2&> /dev/null; then [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do # shellcheck disable=SC2016 disable=SC2086 diff --git a/webapp/start.sh b/webapp/start.sh index 6f4bd74..a087739 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -17,7 +17,7 @@ if [ "${AUTOCONFIGURE}" == true ]; then # The general recommendation is to already build a container that has all required packages installed. ADDITIONAL_KOPANO_PACKAGES="$ADDITIONAL_KOPANO_PACKAGES $ADDITIONAL_KOPANO_WEBAPP_PLUGINS" ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"') - if [ -n "$(mkdir -p "/var/lib/apt/lists/" 2&> /dev/null)" ]; then + if mkdir -p "/var/lib/apt/lists/" 2&> /dev/null; then [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do # shellcheck disable=SC2016 disable=SC2086 diff --git a/zpush/start.sh b/zpush/start.sh index 4269597..566fd14 100755 --- a/zpush/start.sh +++ b/zpush/start.sh @@ -43,7 +43,7 @@ if [ "${AUTOCONFIGURE}" == true ]; then # Hint: this is not compatible with a read-only container. # The general recommendation is to already build a container that has all required packages installed. ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"') - if [ -n "$(mkdir -p "/var/lib/apt/lists/" 2&> /dev/null)" ]; then + if mkdir -p "/var/lib/apt/lists/" 2&> /dev/null; then [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do # shellcheck disable=SC2016 disable=SC2086