diff --git a/maven-meeper/src/bin/d2u b/maven-meeper/src/bin/d2u new file mode 100755 index 0000000000..ea0329fab4 --- /dev/null +++ b/maven-meeper/src/bin/d2u @@ -0,0 +1,2 @@ +perl -p -n -i.bak -e 's/\r\n/\n/' $1 +rm $1.bak diff --git a/maven-meeper/src/bin/deploy-bundle b/maven-meeper/src/bin/deploy-bundle index 115dbcac4b..e583582bf0 100755 --- a/maven-meeper/src/bin/deploy-bundle +++ b/maven-meeper/src/bin/deploy-bundle @@ -23,6 +23,8 @@ cp $BUNDLE $WORKDIR POM=project.xml + ../d2u ${POM} + [ ! -f ${POM} ] && echo && echo "Cannot deploy without the project.xml file!" && echo && exit version=`cat ${POM} | tr '\n' ' ' | sed 's#.*##' | sed 's#.*##' | grep '' | sed -e 's#^.*##;s#.*$##'` @@ -46,17 +48,25 @@ cp $BUNDLE $WORKDIR groupId=${artifactId} fi - echo " version: ${version}" - echo " groupId: ${groupId}" - echo "artifactId: ${artifactId}" + version=`echo ${version} | sed -e 's/ *$//'` + artifactId=`echo ${artifactId} | sed -e 's/ *$//'` + groupId=`echo ${groupId} | sed -e 's/ *$//'` + + echo + echo " version: [${version}]" + echo " groupId: [${groupId}]" + echo "artifactId: [${artifactId}]" + echo [ ! -f LICENSE.txt ] && echo && echo "Cannot deploy without the LICENSE.txt file!" && echo && exit cp project.xml ${artifactId}-${version}.pom - deploy-lic LICENSE.txt ${groupId} + ../d2u LICENSE.txt + + ../deploy-lic LICENSE.txt ${groupId} - deploy-pom ${artifactId}-${version}.pom ${groupId} + ../deploy-pom ${artifactId}-${version}.pom ${groupId} - deploy-jar ${artifactId}-${version}.jar ${groupId} + ../deploy-jar ${artifactId}-${version}.jar ${groupId} )