Author: pcc-guest
Date: 2010-08-25 03:14:07 +0000 (Wed, 25 Aug 2010)
New Revision: 12943
Modified:
trunk/maven-repo-helper/debian/changelog
trunk/maven-repo-helper/src/main/bin/mh_cleanpom
trunk/maven-repo-helper/src/main/bin/mh_installjar
trunk/maven-repo-helper/src/main/bin/mh_linkjar
trunk/maven-repo-helper/src/main/bin/mh_linkrepojar
Log:
Escape all $ characters in usage messages
Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog 2010-08-24 22:35:34 UTC (rev
12942)
+++ trunk/maven-repo-helper/debian/changelog 2010-08-25 03:14:07 UTC (rev
12943)
@@ -2,6 +2,7 @@
[ Peter Collingbourne ]
* Document the correct order of attributes in rules files
+ * Escape all $ characters in usage messages
[ Ludovic Claude ]
* mh_transformpoms: Remove warning about missing parent dependency
Modified: trunk/maven-repo-helper/src/main/bin/mh_cleanpom
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_cleanpom 2010-08-24 22:35:34 UTC
(rev 12942)
+++ trunk/maven-repo-helper/src/main/bin/mh_cleanpom 2010-08-25 03:14:07 UTC
(rev 12943)
@@ -74,7 +74,7 @@
echo -e ""
echo -e "\tEach one of those elements can also be a replace rule, of the
form"
echo -e "\ts/<regex>/<replace>/ where regex is a regular expression, and
replace"
- echo -e "\tis the replacement. Substitution groups $1 $2... can be used in
the"
+ echo -e "\tis the replacement. Substitution groups \$1 \$2... can be used
in the"
echo -e "\treplacement if capture groups () have been used in the regex."
echo -e ""
echo -e "\tThe first element is mandatory (groupId), but you can ignore the"
@@ -91,7 +91,7 @@
echo -e ""
echo -e "Example of a rules file:"
echo -e ""
- echo -e "\ts/commons-(.*)/org.apache.commons.commons$1/"
+ echo -e "\ts/commons-(.*)/org.apache.commons.commons\$1/"
echo -e "\torg.itext * * s/1\\..*/1.x/"
echo -e "\torg.itext * * s/2\\..*/2.x/"
echo -e "\t# use the alpha version of plexus-container-default"
Modified: trunk/maven-repo-helper/src/main/bin/mh_installjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installjar 2010-08-24 22:35:34 UTC
(rev 12942)
+++ trunk/maven-repo-helper/src/main/bin/mh_installjar 2010-08-25 03:14:07 UTC
(rev 12943)
@@ -18,8 +18,8 @@
echo -e "\t[jar] is the path to the jar to install, usually located in the
build"
echo -e "\t folder."
echo -e "\t[link] is an additional link to the jar to install, usually
there should"
- echo -e "\t be a link to usr/share/java/$jar.jar and"
- echo -e "\t usr/share/java/$jar-$version.jar to comply with the Java
packaging"
+ echo -e "\t be a link to usr/share/java/\$jar.jar and"
+ echo -e "\t usr/share/java/\$jar-\$version.jar to comply with the Java
packaging"
echo -e "\t guidelines. Note that there is no need to specify those
particular"
echo -e "\t links if the --java-lib option is used."
echo -e "Options:"
@@ -33,8 +33,8 @@
echo -e "\t debian/maven.rules"
echo -e "\t-l --java-lib: Optional, if given it will install the jar into"
echo -e "\t /usr/share/java to comply with the Debian Java specification."
- echo -e "\t The jar will be installed as
/usr/share/java/$name-$version.jar and"
- echo -e "\t a versionless link /usr/share/java/$name.jar will point to it,
as"
+ echo -e "\t The jar will be installed as
/usr/share/java/\$name-\$version.jar and"
+ echo -e "\t a versionless link /usr/share/java/\$name.jar will point to
it, as"
echo -e "\t well as the links installed in /usr/share/maven-repo"
echo -e "\t-n<name> --usj-name=<name>: Optional, the name to use when
installing the"
echo -e "\t library in /usr/share/java when --java-lib is used."
@@ -48,7 +48,7 @@
echo -e "\t-d<path> --dest-jar=<path>: Optional, the destination for the
real jar."
echo -e "\t The other places where the jar appears, in the repository or
in the"
echo -e "\t list of links, will be symlinks to this jar."
- echo -e "\t Defaults to /usr/share/java/$name-$version.jar if --java-lib
is used,"
+ echo -e "\t Defaults to /usr/share/java/\$name-\$version.jar if --java-lib
is used,"
echo -e "\t otherwise it goes to the versioned path in the Maven
repository."
echo -e "\t-c<classifier> --classifier=<classifier>: Optional, the
classifier for"
echo -e "\t the jar. Empty by default."
Modified: trunk/maven-repo-helper/src/main/bin/mh_linkjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_linkjar 2010-08-24 22:35:34 UTC
(rev 12942)
+++ trunk/maven-repo-helper/src/main/bin/mh_linkjar 2010-08-25 03:14:07 UTC
(rev 12943)
@@ -18,8 +18,8 @@
echo -e "\t[dest_jar] is the path of the installed jar, usually located in
the"
echo -e "\t usr/share/java folder."
echo -e "\t[link] is an additional link to the jar to install, usually
there should"
- echo -e "\t be a link to usr/share/java/$jar.jar and"
- echo -e "\t usr/share/java/$jar-$version.jar to comply with the Java
packaging"
+ echo -e "\t be a link to usr/share/java/\$jar.jar and"
+ echo -e "\t usr/share/java/\$jar-\$version.jar to comply with the Java
packaging"
echo -e "\t guidelines. Note that there is no need to specify those
particular"
echo -e "\t links if the --java-lib option is used."
echo -e "Options:"
@@ -31,8 +31,8 @@
echo -e "\t debian/maven.rules"
echo -e "\t-l --java-lib: Optional, if given it will install the jar into"
echo -e "\t /usr/share/java to comply with the Debian Java specification."
- echo -e "\t The jar will be installed as
/usr/share/java/$name-$version.jar and"
- echo -e "\t a versionless link /usr/share/java/$name.jar will point to it,
as"
+ echo -e "\t The jar will be installed as
/usr/share/java/\$name-\$version.jar and"
+ echo -e "\t a versionless link /usr/share/java/\$name.jar will point to
it, as"
echo -e "\t well as the links installed in /usr/share/maven-repo"
echo -e "\t-n<name> --usj-name=<name>: Optional, the name to use when
installing the"
echo -e "\t library in /usr/share/java when --java-lib is used."
Modified: trunk/maven-repo-helper/src/main/bin/mh_linkrepojar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_linkrepojar 2010-08-24 22:35:34 UTC
(rev 12942)
+++ trunk/maven-repo-helper/src/main/bin/mh_linkrepojar 2010-08-25 03:14:07 UTC
(rev 12943)
@@ -14,8 +14,8 @@
echo -e "\t[pom] is the location of the POM associated with the jar to
install."
echo -e "\t GroupId, artifactId and version will be extracted from this
file."
echo -e "\t[link] is a link to the jar to install, usually there should"
- echo -e "\t be a link to usr/share/java/$jar.jar and"
- echo -e "\t usr/share/java/$jar-$version.jar to comply with the Java
packaging"
+ echo -e "\t be a link to usr/share/java/\$jar.jar and"
+ echo -e "\t usr/share/java/\$jar-\$version.jar to comply with the Java
packaging"
echo -e "\t guidelines. Note that there is no need to specify those
particular"
echo -e "\t links if the --java-lib option is used."
echo -e "Options:"
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
