Harden CRLF handling for Docker shell scripts

Enforce LF line endings for docker and sbin shell scripts via
.gitattributes so Linux container execution remains reliable.

Also normalize ci.sh when sourced from mounted UnitTesting checkouts and
normalize copied UnitTesting sbin scripts in the container as a runtime
safety net for existing Windows working trees.

Author: kaste

.gitattributes

@@ -2,11 +2,15 @@
 # files detected as binary untouched.
 * text=auto
 
+# Shell scripts used in Linux containers must stay LF in the working tree.
+/docker/*.sh               text eol=lf
+/docker/xvfb               text eol=lf
+/sbin/*.sh                 text eol=lf
+
 # Files and directories with the attribute export-ignore won’t be added to
 # archive files. See http://git-scm.com/docs/gitattributes for details.
 
 # Git
-/.gitattributes             export-ignore
 /.github/                   export-ignore
 /.gitignore                 export-ignore
 

docker/docker.sh

@@ -5,12 +5,13 @@ set -e
 BASEDIR=`dirname $0`
 
 UNITTESTING_SOURCE=${UNITTESTING_SOURCE:-/unittesting}
-CISH="$UNITTESTING_SOURCE/sbin/ci.sh"
-if [ ! -f "$CISH" ]; then
-    CISH="/tmp/ci.sh"
-    if [ ! -f "$CISH" ]; then
-        curl -s -L https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/ci.sh -o "$CISH"
-    fi
+SOURCE_CISH="$UNITTESTING_SOURCE/sbin/ci.sh"
+CISH="/tmp/ci.sh"
+if [ -f "$SOURCE_CISH" ]; then
+    # Normalize CRLF from mounted Windows checkouts.
+    sed 's/\r$//' "$SOURCE_CISH" > "$CISH"
+elif [ ! -f "$CISH" ]; then
+    curl -s -L https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/ci.sh -o "$CISH"
 fi
 
 if [ -z "$PACKAGE" ]; then

docker/entrypoint.sh

@@ -10,10 +10,22 @@ BOOTSTRAP_MARKER="$HOME/.cache/unittesting/bootstrap.done"
 sudo sh -e /etc/init.d/xvfb start
 
 UNITTESTING_SOURCE=${UNITTESTING_SOURCE:-/unittesting}
+SUBLIME_TEXT_VERSION=${SUBLIME_TEXT_VERSION:-4}
+if [ "$SUBLIME_TEXT_VERSION" -ge 4 ]; then
+    ST_PACKAGES_DIR="$HOME/.config/sublime-text/Packages"
+else
+    ST_PACKAGES_DIR="$HOME/.config/sublime-text-$SUBLIME_TEXT_VERSION/Packages"
+fi
+
 if [ -d "$UNITTESTING_SOURCE/sbin" ]; then
     # Ensure UnitTesting comes from the local checkout running this script,
     # so first runs do not depend on tagged upstream releases.
     (cd "$UNITTESTING_SOURCE" && PACKAGE=UnitTesting /docker.sh copy_tested_package overwrite)
+
+    # Normalize CRLF in shell scripts copied from Windows workspaces.
+    if [ -d "$ST_PACKAGES_DIR/UnitTesting/sbin" ]; then
+        find "$ST_PACKAGES_DIR/UnitTesting/sbin" -type f -name "*.sh" -exec sed -i 's/\r$//' {} +
+    fi
 fi
 
 if [ ! -f "$BOOTSTRAP_MARKER" ]; then