From f5b0b45b393a284ca927c14ad1ded6a623102d00 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 9 Aug 2021 20:40:51 +0200 Subject: [PATCH] set the correct line endings for git --- autobuild.bat | 2 +- runme64.bat | 2 +- setup/.gitattributes | 3 +++ setup/startup_checks.sh | 6 ------ 4 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 setup/.gitattributes diff --git a/autobuild.bat b/autobuild.bat index 6a10c1aa2..99b574d4d 100644 --- a/autobuild.bat +++ b/autobuild.bat @@ -2,4 +2,4 @@ call setup\setup.cmd taskkill /IM "gpg-agent.exe" /F 2>NUL echo %~dp0builds /builds ntfs noacl 0 0 >>msys2/etc/fstab -call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /setup/autobuild.sh \ No newline at end of file +call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /setup/autobuild.sh diff --git a/runme64.bat b/runme64.bat index 383b02a7b..ae2e87c5e 100644 --- a/runme64.bat +++ b/runme64.bat @@ -2,4 +2,4 @@ cd %~dp0 call setup\setup.cmd call msys2\msys2_shell.cmd -mingw64 -defterm -no-start %* -if not exist setup\installed64.txt msys2\msys2_shell.cmd -mingw64 -defterm -no-start %* \ No newline at end of file +if not exist setup\installed64.txt msys2\msys2_shell.cmd -mingw64 -defterm -no-start %* diff --git a/setup/.gitattributes b/setup/.gitattributes new file mode 100644 index 000000000..bce21f589 --- /dev/null +++ b/setup/.gitattributes @@ -0,0 +1,3 @@ +* text eol=lf +*.cmd text eol=crlf +*.bat text eol=crlf diff --git a/setup/startup_checks.sh b/setup/startup_checks.sh index 4e087f9e9..8987d3663 100644 --- a/setup/startup_checks.sh +++ b/setup/startup_checks.sh @@ -5,9 +5,3 @@ if ! (echo "$PWD" | grep -Eq ^[a-zA-Z0-9\/\._\-]+$) ; then echo "Error: Install path contains special characters!" sleep infinity fi - -#Using git to download ProxSpace will cause an installation error -if [ -d "$PWD/.git" ]; then - echo "Error: Do not use Git to download ProxSpace!" - sleep infinity -fi \ No newline at end of file