Merge pull request #78 from eliasvasylenko/master

Fix for #77 removing dependence on native `cat` utility.
osgi · Mar 22, 2017 · a6cccee · a6cccee
2 parents c4875ad + c5147ce
commit a6cccee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd b/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd
@@ -51,8 +51,6 @@ Provide-Capability: \
 
 -includeresource: \
 	{${path}=${base.version}}, \
-	${path}/enmarkdown.js; \
-		requires='${project}/${base.version}/enmarkdown.js,${project}/${base.version}/Markdown.Converter.js'; \
-		cmd='cat ${project}/${base.version}/enmarkdown.js ${project}/${base.version}/Markdown.Converter.js', \
+	{${path}/enmarkdown.js=enmarkdown.js.concat}, \
 	${base.version}/LICENSE.txt, \
 	{readme.md}
diff --git a/osgi.enroute.stackexchange.pagedown.webresource/enmarkdown.js.concat b/osgi.enroute.stackexchange.pagedown.webresource/enmarkdown.js.concat
@@ -0,0 +1,2 @@
+${cat;${project}/${base.version}/enmarkdown.js}
+${cat;${project}/${base.version}/Markdown.Converter.js}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		${cat;${project}/${base.version}/enmarkdown.js}
		${cat;${project}/${base.version}/Markdown.Converter.js}