[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5742] trunk/mavenize/mavenize.pl

[<man...@us...>]

Revision: 5742
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5742&view=rev
Author:   manningr
Date:     2010-07-18 18:55:10 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
Switched the order of sort and uniq as according to the man page for uniq, it will only collapse duplicate lines if they are adjacent.

Modified Paths:
--------------
    trunk/mavenize/mavenize.pl

Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl	2010-07-18 18:54:24 UTC (rev 5741)
+++ trunk/mavenize/mavenize.pl	2010-07-18 18:55:10 UTC (rev 5742)
@@ -598,19 +598,19 @@
 sub findAndCopyJava {
 	return if $onlyCopyPoms;
 	print "Copying source files from src/... to /src/main/java...\n";
-`find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents ./main/java/{}`;
+`find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn mkdir --parents ./main/java/{}`;
 	`svn add --quiet main`;
 	`find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`;
-`find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} ./main/java/{}`;
+`find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn move {} ./main/java/{}`;
 }
 
 sub findAndCopyResources {
 	return if $onlyCopyPoms;
 	my $fileType = shift;
-`find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn mkdir --parents main/resources/{}`;
+`find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn mkdir --parents main/resources/{}`;
 	`svn add --quiet main`;
 	`find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`;
-`find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn move {} main/resources/{}`;
+`find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn move {} main/resources/{}`;
 }
 
 sub findAndCopyDoc {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.