LRCI-783 Get correct module base dir based on subrepository name

liferay · Nov 14, 2019 · ca879b0 · ca879b0
1 parent 518fba5
commit ca879b0
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/build-test.xml b/build-test.xml
@@ -661,10 +661,6 @@ jdbc.counter.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 		<sequential>
 			<var name="module.base.dir" unset="true" />
 
-			<antelope:stringutil property="subrepository.name" string="@{subrepository.name}">
-				<antelope:replace regex="(.+)-private" replacement="$1" />
-			</antelope:stringutil>
-
 			<for param="gitrepo.file">
 				<fileset
 					dir="${project.dir}/modules"
@@ -674,18 +670,11 @@ jdbc.counter.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 					<include name="**/.gitrepo" />
 				</fileset>
 				<sequential>
-					<local name="gitrepo.file.content" />
-
-					<loadfile
-						property="gitrepo.file.content"
-						srcfile="@{gitrepo.file}"
-					/>
-
 					<if>
-						<or>
-							<contains string="${gitrepo.file.content}" substring="git@github.com:liferay/${subrepository.name}.git" />
-							<contains string="${gitrepo.file.content}" substring="git@github.com:liferay/${subrepository.name}-private.git" />
-						</or>
+						<resourcecontains
+							resource="@{gitrepo.file}"
+							substring="git@github.com:liferay/@{subrepository.name}.git"
+						/>
 						<then>
 							<antelope:stringutil property="module.base.dir" string="@{gitrepo.file}">
 								<antelope:replace regex="\\" replacement="/" />