Fix formatting
rodzic
68c6a33c9d
commit
b057bf9be1
|
@ -22,10 +22,9 @@ fi
|
||||||
if [[ -z "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]] &&
|
if [[ -z "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]] &&
|
||||||
[[ -z "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]]; then
|
[[ -z "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]]; then
|
||||||
echo "[custom-init] no custom services found, skipping..."
|
echo "[custom-init] no custom services found, skipping..."
|
||||||
fi
|
else
|
||||||
|
# Make sure custom service directory exists and has files in it
|
||||||
# Make sure custom service directory exists and has files in it
|
if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]]; then
|
||||||
if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]]; then
|
|
||||||
echo "[custom-init] service files found in ${SERVICES_DIR}"
|
echo "[custom-init] service files found in ${SERVICES_DIR}"
|
||||||
for SERVICE in "${SERVICES_DIR}"/*; do
|
for SERVICE in "${SERVICES_DIR}"/*; do
|
||||||
NAME="$(basename "${SERVICE}")"
|
NAME="$(basename "${SERVICE}")"
|
||||||
|
@ -41,9 +40,9 @@ if [[ -e "${SERVICES_DIR}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null
|
||||||
echo "[custom-init] ${NAME}: is not a file"
|
echo "[custom-init] ${NAME}: is not a file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -e "${SERVICES_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]]; then
|
if [[ -e "${SERVICES_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]]; then
|
||||||
echo "[custom-init] service files found in ${SERVICES_DIR_OLD}"
|
echo "[custom-init] service files found in ${SERVICES_DIR_OLD}"
|
||||||
for SERVICE in "${SERVICES_DIR_OLD}"/*; do
|
for SERVICE in "${SERVICES_DIR_OLD}"/*; do
|
||||||
NAME="$(basename "${SERVICE}")"
|
NAME="$(basename "${SERVICE}")"
|
||||||
|
@ -59,6 +58,7 @@ if [[ -e "${SERVICES_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/
|
||||||
echo "[custom-init] ${NAME}: is not a file"
|
echo "[custom-init] ${NAME}: is not a file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Exit if mods is not set
|
# Exit if mods is not set
|
||||||
|
@ -70,7 +70,7 @@ fi
|
||||||
if [ ! -f /usr/bin/curl ] || [ ! -f /usr/bin/jq ]; then
|
if [ ! -f /usr/bin/curl ] || [ ! -f /usr/bin/jq ]; then
|
||||||
echo "[mod-init] Curl/JQ was not found on this system for Docker mods installing"
|
echo "[mod-init] Curl/JQ was not found on this system for Docker mods installing"
|
||||||
if [ -f /usr/bin/apt ]; then
|
if [ -f /usr/bin/apt ]; then
|
||||||
## Ubuntu
|
# Ubuntu
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
curl \
|
curl \
|
||||||
|
|
Ładowanie…
Reference in New Issue