Merge pull request #26 from linuxserver/kali-custom-files-x

Author: thespad

Dockerfile

@@ -42,10 +42,10 @@ RUN \
     /root-out/var/log/* && \
   echo "**** modify layer repo ****" && \
   echo "deb http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" > /root-out/etc/apt/sources.list && \
-  echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" >> /root-out/etc/apt/sources.list 
+  echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" >> /root-out/etc/apt/sources.list
 
 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.6.2"
+ARG S6_OVERLAY_VERSION="3.2.1.0"
 ARG S6_OVERLAY_ARCH="x86_64"
 
 # add s6 overlay

Dockerfile.aarch64

@@ -42,10 +42,10 @@ RUN \
     /root-out/var/log/* && \
   echo "**** modify layer repo ****" && \
   echo "deb http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" > /root-out/etc/apt/sources.list && \
-  echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" >> /root-out/etc/apt/sources.list 
+  echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware" >> /root-out/etc/apt/sources.list
 
 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.6.2"
+ARG S6_OVERLAY_VERSION="3.2.1.0"
 ARG S6_OVERLAY_ARCH="aarch64"
 
 # add s6 overlay

root/etc/s6-overlay/s6-rc.d/init-custom-files/run

@@ -9,12 +9,12 @@ if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)"
     echo "[custom-init] Files found, executing"
     for SCRIPT in "${SCRIPTS_DIR}"/*; do
         NAME="$(basename "${SCRIPT}")"
-        if [[ -f "${SCRIPT}" ]]; then
+        if [[ -x "${SCRIPT}" ]]; then
             echo "[custom-init] ${NAME}: executing..."
             /bin/bash "${SCRIPT}"
             echo "[custom-init] ${NAME}: exited $?"
-        elif [[ ! -f "${SCRIPT}" ]]; then
-            echo "[custom-init] ${NAME}: is not a file"
+        elif [[ ! -x "${SCRIPT}" ]]; then
+            echo "[custom-init] ${NAME}: is not an executable file"
         fi
     done
 else