From 02d567f7e68e2b67beb784bbc7b4821cc64e6781 Mon Sep 17 00:00:00 2001
From: lu4p <lu4p@pm.me>
Date: Fri, 14 Aug 2020 22:04:06 +0200
Subject: [PATCH] Fix

---
 .github/workflows/test.yml |  4 +-
 crlf_test.sh               | 36 +++++++----------
 testdata/scripts/tiny.txt  | 80 +++++++++++++++++++-------------------
 3 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d3f3881..1a68658 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,10 +41,10 @@ jobs:
       run: |
         go version
         go test ./...
-  test-conventions:
+  code-checks:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Test that on LF line endings are used
+    - name: Test that only LF line endings are used
       run: bash crlf_test.sh
diff --git a/crlf_test.sh b/crlf_test.sh
index fa3242e..86df13b 100644
--- a/crlf_test.sh
+++ b/crlf_test.sh
@@ -1,27 +1,19 @@
 #!/bin/bash
-echo "searching for CRLF endings in: ."
-
-BOLD_RED='\033[1;31m'
-BOLD_GREEN='\033[1;32m'
-NC='\033[0m'
-
-ERROR_COUNT=0
-
 if \
-  grep \
-    --recursive \
-    --files-with-matches \
-    --binary \
-    --binary-files=without-match \
-    --max-count=1 \
-    --exclude-dir="\.git" \
-    $'\r' \
-    . \
-  ; then
-  # TODO exit status should be number of files with wrong endings found
-  echo -e "${BOLD_RED}Found at least a file with CRLF endings.${NC}"
-  exit 1
+	grep \
+		--recursive \
+		--files-with-matches \
+		--binary \
+		--binary-files=without-match \
+		--max-count=1 \
+		--exclude-dir="\.git" \
+		$'\r' \
+		. \
+	; then
+	# TODO exit status should be number of files with wrong endings found
+	echo -e "Found at least a file with CRLF endings."
+	exit 1
 fi
 
-echo -e "${BOLD_GREEN}No files with CRLF endings found.${NC}"
+echo -e "No files with CRLF endings found."
 exit 0
\ No newline at end of file
diff --git a/testdata/scripts/tiny.txt b/testdata/scripts/tiny.txt
index 001d2b7..d86b724 100644
--- a/testdata/scripts/tiny.txt
+++ b/testdata/scripts/tiny.txt
@@ -1,41 +1,41 @@
-env TINY_PATTERN='^\/\/line :1$'
-env DEFAULT_PATTERN='^\/\/line \w\.go:[1-9][0-9]*$'
-env DEFAULT_STACK_PATTERN='^\t\w\.go:[1-9][0-9]*(\s\+0x[0-9a-f]+)?'
-env TINY_STACK_PATTERN='^\t\?\?:[0-9][0-9]*(\s\+0x[0-9a-f]+)?$'
-
-# Tiny mode
-garble -tiny -debugdir=.obf-src build
-
-grep $TINY_PATTERN .obf-src/main/main.go
-! grep $DEFAULT_PATTERN .obf-src/main/main.go
-
-! exec ./main$exe
-! stderr 'main\.go'
-! stderr $DEFAULT_STACK_PATTERN
-stderr $TINY_STACK_PATTERN
-
-[short] stop # no need to verify this with -short
-
-# Default mode
-
-garble -debugdir=.obf-src build
-
-# Check for file name leak protection
-grep $TINY_PATTERN .obf-src/main/main.go
-
-# Check for default line obfuscation
-grep $DEFAULT_PATTERN .obf-src/main/main.go
-
-! exec ./main$exe
-! stderr 'main\.go'
-! stderr $TINY_STACK_PATTERN
-stderr $DEFAULT_STACK_PATTERN
-
--- go.mod --
-module main
--- main.go --
-package main
-
-func main() {
-	panic("Test")
+env TINY_PATTERN='^\/\/line :1$'
+env DEFAULT_PATTERN='^\/\/line \w\.go:[1-9][0-9]*$'
+env DEFAULT_STACK_PATTERN='^\t\w\.go:[1-9][0-9]*(\s\+0x[0-9a-f]+)?'
+env TINY_STACK_PATTERN='^\t\?\?:[0-9][0-9]*(\s\+0x[0-9a-f]+)?$'
+
+# Tiny mode
+garble -tiny -debugdir=.obf-src build
+
+grep $TINY_PATTERN .obf-src/main/main.go
+! grep $DEFAULT_PATTERN .obf-src/main/main.go
+
+! exec ./main$exe
+! stderr 'main\.go'
+! stderr $DEFAULT_STACK_PATTERN
+stderr $TINY_STACK_PATTERN
+
+[short] stop # no need to verify this with -short
+
+# Default mode
+
+garble -debugdir=.obf-src build
+
+# Check for file name leak protection
+grep $TINY_PATTERN .obf-src/main/main.go
+
+# Check for default line obfuscation
+grep $DEFAULT_PATTERN .obf-src/main/main.go
+
+! exec ./main$exe
+! stderr 'main\.go'
+! stderr $TINY_STACK_PATTERN
+stderr $DEFAULT_STACK_PATTERN
+
+-- go.mod --
+module main
+-- main.go --
+package main
+
+func main() {
+	panic("Test")
 }
\ No newline at end of file