From b296a41565172c07c68cdc6db1243712c0720289 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 21 Oct 2010 17:38:49 +0200
Subject: [PATCH] CRLF fixes, .gitattributes file updated

---
 .gitattributes                   | 48 +++++++++++++++++++++++++-------
 misc/tools/shadescript/shade.vbs | 46 +++++++++++++++---------------
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index c9a3366e..6cd31cea 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,20 +1,29 @@
 * -crlf
 
+*.0 -diff -crlf
+*.1 crlf=input
+*.3 crlf=input
 *.7z -diff -crlf
 *.ac crlf=input
+*.a -diff -crlf
 *.afm crlf=input
 *.aft crlf=input
+*.ai -diff -crlf
 *.aliases crlf=input
 all crlf=input
 *.am crlf=input
 *.animinfo crlf=input
 *.aps -diff -crlf
+*.asc -diff -crlf
 *.ase -crlf
 *.bat -crlf
 *.bgs crlf=input
+*.blend1 -diff -crlf
 *.blend -diff -crlf
+blind_id -diff -crlf
 *.bmp -diff -crlf
 branch-manager crlf=input
+*.brand crlf=input
 BSDmakefile crlf=input
 bsp2ent crlf=input
 *.bsp -diff -crlf
@@ -26,6 +35,7 @@ bsp2ent crlf=input
 *.cg crlf=input
 ChangeLog crlf=input
 CHANGES crlf=input
+cjpeg -diff -crlf
 COMPILING crlf=input
 compress-texture crlf=input
 *.conf crlf=input
@@ -33,20 +43,22 @@ CONTRIBUTORS crlf=input
 COPYING crlf=input
 *.cpp crlf=input
 create crlf=input
+*.cron crlf=input
 *.css crlf=input
-Current -diff -crlf
-*.cvsignore crlf=input
 *.cvswrappers crlf=input
-*.dat -diff -crlf
+*.d0pk -diff -crlf
 *.db -diff -crlf
 *.default crlf=input
 *.def crlf=input
 *.dem -diff -crlf
 *.dev -crlf
+dir -diff -crlf
+djpeg -diff -crlf
 *.dll -diff -crlf
 DOCS -diff -crlf
 *.dot crlf=input
 DoxyConfig crlf=input
+doxyfile crlf=input
 Doxyfile crlf=input
 *.doxygen crlf=input
 *.dpm -diff -crlf
@@ -54,11 +66,13 @@ Doxyfile crlf=input
 *.dsw -crlf
 *.dtd crlf=input
 *.dylib -diff -crlf
+empty -diff -crlf
 *.EncoderPlugin crlf=input
-*.ent -crlf
+*.flac -diff -crlf
 *.form crlf=input
 *.framegroups crlf=input
 *.game crlf=input
+*.gdb crlf=input
 gendox crlf=input
 gendoxfunctions crlf=input
 genDoxyfile crlf=input
@@ -68,7 +82,10 @@ git-branch-manager crlf=input
 git-filter-index crlf=input
 git-filter-repository crlf=input
 *.gitignore crlf=input
+git-pk3-import crlf=input
+git-pk3-merge crlf=input
 git-pullall crlf=input
+git-recurse crlf=input
 git-split-repository crlf=input
 git-svn-checkout crlf=input
 git-svn-update crlf=input
@@ -83,24 +100,31 @@ GPL crlf=input
 *.html-part crlf=input
 *.icns -diff -crlf
 *.ico -diff -crlf
+*.idl crlf=input
 *.idsoftware crlf=input
 *.inc crlf=input
 *.in crlf=input
+*.info-1 -diff -crlf
+*.info-2 -diff -crlf
+*.info -diff -crlf
+*.inl crlf=input
 *.instantaction crlf=input
 *.iqm -diff -crlf
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input
+jpegtran -diff -crlf
 *.jpg -diff -crlf
 *.jsmooth crlf=input
+*.la crlf=input
 LGPL crlf=input
 LICENSE crlf=input
 *.lmp -diff -crlf
 *.loaders crlf=input
 *.lso -diff -crlf
+*.m4 crlf=input
 makefile crlf=input
 Makefile crlf=input
-*.makespr32 crlf=input
 makespr32 crlf=input
 *.map -crlf filter=mapclean
 *.mapinfo crlf=input
@@ -115,9 +139,7 @@ makespr32 crlf=input
 *.mk crlf=input
 *.mkdir -diff -crlf
 *.mmpz -diff -crlf
-*.modinfo crlf=input
 *.modules crlf=input
-nexuiz-map-compiler crlf=input
 *.nib -crlf
 *.obj -crlf
 OFFSETS -diff -crlf
@@ -126,6 +148,7 @@ OFFSETS -diff -crlf
 pangorc crlf=input
 *.patch crlf=input
 *.patchsets crlf=input
+*.pc crlf=input
 *.pcx -diff -crlf
 *.pfb -diff -crlf
 *.pfm -diff -crlf
@@ -147,13 +170,14 @@ POSITIONS -diff -crlf
 *.rb crlf=input
 *.rc2 crlf=input
 *.rc -crlf
+rdjpgcom -diff -crlf
 *.readme crlf=input
 README crlf=input
 *.rtlights -diff -crlf
 SCHEMA crlf=input
 *.scm crlf=input
+sdl-config crlf=input
 SDL -diff -crlf
-SDLMain.m crlf=input
 *.shader crlf=input
 *.sh crlf=input
 *.skin crlf=input
@@ -164,7 +188,6 @@ SDLMain.m crlf=input
 *.spr -diff -crlf
 *.src crlf=input
 *.strings crlf=input
-*.strip crlf=input
 strip crlf=input
 *.svg -diff -crlf
 *.TAB -diff -crlf
@@ -175,19 +198,24 @@ TODO crlf=input
 *.ttf -diff -crlf
 *.TTF -diff -crlf
 *.txt crlf=input
-*.TXT crlf=input
 update-shaderlists crlf=input
+*.vbs crlf=input
 *.vcproj -crlf
+versionbuilder crlf=input
 *.wav -diff -crlf
 *.waypoints -diff -crlf
 w crlf=input
 *.width crlf=input
 *.workspace -crlf
+wrjpgcom -diff -crlf
 *.xcf -diff -crlf
 *.xlink crlf=input
 *.xml crlf=input
 xonotic-map-compiler-autobuild crlf=input
 xonotic-map-compiler crlf=input
+xonotic-map-screenshot crlf=input
+xonotic-osx-agl crlf=input
+xonotic-osx-sdl crlf=input
 *.xpm crlf=input
 *.zip -diff -crlf
 zipdiff crlf=input
diff --git a/misc/tools/shadescript/shade.vbs b/misc/tools/shadescript/shade.vbs
index e5dc4bed..6721aa6e 100644
--- a/misc/tools/shadescript/shade.vbs
+++ b/misc/tools/shadescript/shade.vbs
@@ -1,28 +1,28 @@
 option explicit 
 
 
-Const ForReading = 1
-Const ForWriting = 2
-Const ForAppending = 8
+Const ForReading = 1
+Const ForWriting = 2
+Const ForAppending = 8
 
 dim CRLF 
 
-CRLF = Chr(13) & Chr(10)
+CRLF = Chr(13) & Chr(10)
 
-dim scriptFullName, scriptPath 
-scriptFullName = WScript.ScriptFullName
+dim scriptFullName, scriptPath 
+scriptFullName = WScript.ScriptFullName
 scriptPath = Left ( scriptFullName, InStrRev ( scriptFullName, WScript.ScriptName) - 1 )
-
+
 dim objFSO, setfolder, re, shader, objShaderTemplate, shaderTemplate
-Set objFSO = CreateObject("Scripting.FileSystemObject")
-Set setfolder = objFSO.GetFolder(scriptPath)
+Set objFSO = CreateObject("Scripting.FileSystemObject")
+Set setfolder = objFSO.GetFolder(scriptPath)
 Set re = New RegExp
 
 re.IgnoreCase = True
 re.Global = True
-re.Pattern = ""
-
-Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)
+re.Pattern = ""
+
+Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)
 
 Set objShaderTemplate = objFSO.OpenTextFile(scriptPath & "\template.shader", ForReading)
 shaderTemplate = objShaderTemplate.ReadAll()
@@ -30,13 +30,13 @@ shaderTemplate = objShaderTemplate.ReadAll()
 function filetitle(sfilename)
 	filetitle = Left(sfilename, len(sfilename) - 4)
 end function 
-
+
 dim noLightmap, isLiquid, isTransparent, bounceScale, shaderString
 dim shaderHead, shaderTail, shaderQUI, shaderDiffuse, diffuseExtra
 dim subfold, texfile, fn
 
-For Each subfold in setfolder.Subfolders
-	' shader.write "Folder: " & subfold.Name & CRLF
+For Each subfold in setfolder.Subfolders
+	' shader.write "Folder: " & subfold.Name & CRLF
 	For Each texfile In subfold.Files
 		'Defaults		
 		noLightmap 		= false
@@ -53,7 +53,7 @@ For Each subfold in setfolder.Subfolders
 		
 		' First ignore any extra map or Thumbs.db
 		re.Pattern = "_bump.|_gloss.|_norm.|_glow.|Thumbs.db"
-		if not re.test(texfile.name) then			
+		if not re.test(texfile.name) then			
 			re.pattern = "decal"
 			if re.test(texfile.name) then
 				noLightmap = true
@@ -163,10 +163,10 @@ For Each subfold in setfolder.Subfolders
 
 			
 			shader.write shaderString & CRLF & CRLF
-		end if
-	Next
-Next
-shader.Close
-
-
-
+		end if
+	Next
+Next
+shader.Close
+
+
+
-- 
2.39.2