This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository hsqldb.
commit c8f77007f96a78f67bdfd63c8bafe9a47ab2b85c Author: Markus Koschany <[email protected]> Date: Thu Sep 17 20:26:18 2015 +0200 Fix sed command --- debian/bin/Makefile | 19 +++++++++++++------ debian/bin/hsqldb.in | 3 +-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/bin/Makefile b/debian/bin/Makefile index 0eaac05..4044065 100644 --- a/debian/bin/Makefile +++ b/debian/bin/Makefile @@ -2,14 +2,21 @@ scripts = $(addprefix hsqldb-,databasemanager databasemanagerswing transfer sqlt all: $(scripts) -hsqldb-databasemanager: class=DatabaseManager path=util -hsqldb-databasemanagerswing: class=DatabaseManagerSwing path=util -hsqldb-transfer: class=Transfer path=util -hsqldb-sqltool: class=SqlTool path=cmdline +hsqldb-databasemanager: class=DatabaseManager +hsqldb-databasemanager: path=util +hsqldb-databasemanager: arg=\"$$\@\" +hsqldb-databasemanagerswing: class=DatabaseManagerSwing +hsqldb-databasemanagerswing: path=util +hsqldb-databasemanagerswing: arg=--help +hsqldb-transfer: class=Transfer +hsqldb-transfer: path=util +hsqldb-transfer: arg=--help +hsqldb-sqltool: class=SqlTool +hsqldb-sqltool: path=cmdline +hsqldb-sqltool: arg=\"$$\@\" $(scripts): hsqldb.in - sed "s/@CLASS@/$(class)/g" $< >$@ - sed "s/@PATH@/$(path)/g" $< >$@ + sed -e "s/@CLASS@/$(class)/g" -e "s/@PATH@/$(path)/g" -e "s/@ARG@/$(arg)/g" $< >$@ chmod a+x $@ clean: diff --git a/debian/bin/hsqldb.in b/debian/bin/hsqldb.in index 4fc00a6..9082bfd 100644 --- a/debian/bin/hsqldb.in +++ b/debian/bin/hsqldb.in @@ -2,5 +2,4 @@ set -e -exec java -cp -$CLASSPATH:/usr/share/java/hsqldbutil.jar:/usr/share/java/hsqldb.jar:/usr/share/java/postgresql.jar:/usr/share/java/mysql.jar"org.hsqldb.@PATH@.@CLASS@" "$@" +exec java -cp $CLASSPATH:/usr/share/java/hsqldbutil.jar:/usr/share/java/hsqldb.jar:/usr/share/java/postgresql.jar:/usr/share/java/mysql.jar "org.hsqldb.@PATH@.@CLASS@" @ARG@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hsqldb.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
