以下情况:
我正在使用运行OS X的Mac,并且最近加入了一个项目,其成员到目前为止都使用Windows。我的第一个任务之一是在Git存储库中设置代码库,所以我从FTP中提取目录树并尝试将其检入我本地准备的Git仓库。在尝试这样做的时候,我得到的就是这个
fatal: CRLF would be replaced by LF in blog/license.txt.
由于这会影响“blog”文件夹下的所有文件,因此我正在寻找一种方便地将树中的所有文件转换为Unix行结尾的方法。是否有一个开箱即用的工具或我自己编写脚本?
作为参考,我的Git配置涉及行结尾:
core.safecrlf=true
core.autocrlf=input
答案 0 :(得分:228)
dos2unix为你做到了这一点。相当直接的过程。
dos2unix filename
感谢toolbear,这里有一个单行代码,递归替换行结尾并正确处理空格,引号和shell元字符。
find ./ -type f -exec dos2unix {} \;
如果你正在使用dos2unix 6.0,二进制文件将被忽略。
答案 1 :(得分:45)
假设您有GNU grep
和perl
,这将在当前目录下的非二进制文件中以递归方式将CRLF转换为LF:
find . -type f -exec grep -qIP '\r\n' {} ';' -exec perl -pi -e 's/\r\n/\n/g' {} '+'
在当前目录下递归查找;将.
更改为blog
或whatev
子目录以限制替换:
find .
仅匹配常规文件:
-type f
测试文件是否包含CRLF。排除二进制文件。为每个常规文件运行grep
命令。这是排除二进制文件的代价。如果您有一个旧的grep
,您可以尝试使用file
命令构建测试:
-exec grep -qIP '\r\n' {} ';'
用LF替换CRLF。带有第二个'+'
的{{1}}告诉-exec
累积匹配的文件并将它们传递给命令的一个(或尽可能少的)调用 - 例如管道到find
,但如果文件路径包含空格,引号或其他shell元字符,则没有问题。 xargs
中的i
告诉perl修改文件。您可以在这里使用-pi
或sed
进行一些工作,并且您可能会将“+”更改为“;”并为每个匹配调用一个单独的进程:
awk
答案 2 :(得分:27)
这是一个更好的选择:Swiss File Knife。它以递归方式跨子目录工作,并正确处理空格和特殊字符。
您所要做的就是:
sfk remcr -dir your_project_directory
奖金: sfk 也会进行大量其他转换。请参阅下面的完整列表:
SFK - The Swiss File Knife File Tree Processor.
Release 1.6.7 Base Revision 2 of May 3 2013.
StahlWorks Technologies, http://stahlworks.com/
Distributed for free under the BSD License, without any warranty.
type "sfk commandname" for help on any of the following.
some commands require to add "-help" for the help text.
file system
sfk list - list directory tree contents.
list latest, oldest or biggest files.
list directory differences.
list zip jar tar gz bz2 contents.
sfk filefind - find files by filename
sfk treesize - show directory size statistics
sfk copy - copy directory trees additively
sfk sync - mirror tree content with deletion
sfk partcopy - copy part from a file into another one
sfk mkdir - create directory tree
sfk delete - delete files and folders
sfk deltree - delete whole directory tree
sfk deblank - remove blanks in filenames
sfk space [-h] - tell total and free size of volume
sfk filetime - tell times of a file
sfk touch - change times of a file
conversion
sfk lf-to-crlf - convert from LF to CRLF line endings
sfk crlf-to-lf - convert from CRLF to LF line endings
sfk detab - convert TAB characters to spaces
sfk entab - convert groups of spaces to TAB chars
sfk scantab - list files containing TAB characters
sfk split - split large files into smaller ones
sfk join - join small files into a large one
sfk hexdump - create hexdump from a binary file
sfk hextobin - convert hex data to binary
sfk hex - convert decimal number(s) to hex
sfk dec - convert hex number(s) to decimal
sfk chars - print chars for a list of codes
sfk bin-to-src - convert binary to source code
text processing
sfk filter - search, filter and replace text data
sfk addhead - insert string at start of text lines
sfk addtail - append string at end of text lines
sfk patch - change text files through a script
sfk snapto - join many text files into one file
sfk joinlines - join text lines split by email reformatting
sfk inst - instrument c++ sourcecode with tracing calls
sfk replace - replace words in binary and text files
sfk hexfind - find words in binary files, showing hexdump
sfk run - run command on all files of a folder
sfk runloop - run a command n times in a loop
sfk printloop - print some text many times
sfk strings - extract strings from a binary file
sfk sort - sort text lines produced by another command
sfk count - count text lines, filter identical lines
sfk head - print first lines of a file
sfk tail - print last lines of a file
sfk linelen - tell length of string(s)
search and compare
sfk find - find words in binary files, showing text
sfk md5gento - create list of md5 checksums over files
sfk md5check - verify list of md5 checksums over files
sfk md5 - calc md5 over a file, compare two files
sfk pathfind - search PATH for location of a command
sfk reflist - list fuzzy references between files
sfk deplist - list fuzzy dependencies between files
sfk dupfind - find duplicate files by content
networking
sfk httpserv - run an instant HTTP server.
type "sfk httpserv -help" for help.
sfk ftpserv - run an instant FTP server
type "sfk ftpserv -help" for help.
sfk ftp - instant anonymous FTP client
sfk wget - download HTTP file from the web
sfk webrequest - send HTTP request to a server
sfk tcpdump - print TCP conversation between programs
sfk udpdump - print incoming UDP requests
sfk udpsend - send UDP requests
sfk ip - tell own machine's IP address(es).
type "sfk ip -help" for help.
sfk netlog - send text outputs to network,
and/or file, and/or terminal
scripting
sfk script - run many sfk commands in a script file
sfk echo - print (coloured) text to terminal
sfk color - change text color of terminal
sfk alias - create command from other commands
sfk mkcd - create command to reenter directory
sfk sleep - delay execution for milliseconds
sfk pause - wait for user input
sfk label - define starting point for a script
sfk tee - split command output in two streams
sfk tofile - save command output to a file
sfk toterm - flush command output to terminal
sfk loop - repeat execution of a command chain
sfk cd - change directory within a script
sfk getcwd - print the current working directory
sfk require - compare version text
development
sfk bin-to-src - convert binary data to source code
sfk make-random-file - create file with random data
sfk fuzz - change file at random, for testing
sfk sample - print example code for programming
sfk inst - instrument c++ with tracing calls
diverse
sfk media - cut video and binary files
sfk view - show results in a GUI tool
sfk toclip - copy command output to clipboard
sfk fromclip - read text from clipboard
sfk list - show directory tree contents
sfk env - search environment variables
sfk version - show version of a binary file
sfk ascii - list ISO 8859-1 ASCII characters
sfk ascii -dos - list OEM codepage 850 characters
sfk license - print the SFK license text
help by subject
sfk help select - how dirs and files are selected in sfk
sfk help options - general options reference
sfk help patterns - wildcards and text patterns within sfk
sfk help chain - how to combine (chain) multiple commands
sfk help shell - how to optimize the windows command prompt
sfk help unicode - about unicode file reading support
sfk help colors - how to change result colors
sfk help xe - for infos on sfk extended edition.
All tree walking commands support file selection this way:
1. short format with ONE directory tree and MANY file name patterns:
src1dir .cpp .hpp .xml bigbar !footmp
2. short format with a list of explicite file names:
letter1.txt revenues9.xls report3\turnover5.ppt
3. long format with MANY dir trees and file masks PER dir tree:
-dir src1 src2 !src\save -file foosys .cpp -dir bin5 -file .exe
For detailed help on file selection, type "sfk help select".
* and ? wildcards are supported within filenames. "foo" is interpreted
as "*foo*", so you can leave out * completely to search a part of a name.
For name start comparison, say "\foo" (finds foo.txt but not anyfoo.txt).
When you supply a directory name, by default this means "take all files".
sfk list mydir lists ALL files of mydir, no * needed.
sfk list mydir .cpp .hpp lists SOME files of mydir, by extension.
sfk list mydir !.cfg lists all files of mydir EXCEPT .cfg
general options:
-tracesel tells in detail which files and/or directories are included
or excluded, and why (due to which user-supplied mask).
-nosub do not process files within subdirectories.
-nocol before any command switches off color output.
-quiet or -nohead shows less output on some commands.
-hidden includes hidden and system files and dirs.
For detailed help on all options, type "sfk help options".
beware of Shell Command Characters.
command parameters containing characters < > | ! & must be sur-
rounded by quotes "". type "sfk filter" for details and examples.
type "sfk ask word1 word2 ..." to search ALL help text for words.
type "sfk dumphelp" to print ALL help text.
编辑:提醒一句:在具有二进制文件的文件夹上运行时要小心,因为它会有效地破坏您的文件,特别是.git目录。如果是这种情况,请在整个文件夹中不运行sfk,而是选择特定的文件扩展名(* .rb,* .py等)。示例:sfk remcr -dir chef -file .rb -file .json -file .erb -file .md
答案 3 :(得分:9)
find . -not \( -name .svn -prune -o -name .git -prune \) -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;
这样更安全,因为它可以避免破坏你的git repo。使用.bzr,.hg或您使用的任何源控件添加或替换.git,.svn到不列表。
答案 4 :(得分:8)
在OS X上,这对我有用:
find ./ -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;
警告:请在执行此命令之前备份您的目录。
答案 5 :(得分:1)
如果使用sed,这里是一种解决方案:
find . -type f -exec sed -i 's/\r$//' {} \;
-i
代表就地,如果您还想创建备份,请使用-i.bak
's/\r$//'
将替换每行末尾的所有回车符(\r
)