[Hyperic-hq-discuss] hq r14501 - trunk/tools/dbmigrate/bin

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-13 14:28:28 -0700 (Tue, 13 Apr 2010)
New Revision: 14501
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14501

Modified:
   trunk/tools/dbmigrate/bin/migrateDB
Log:
changed LIBS var to handle basedir correctly

Modified: trunk/tools/dbmigrate/bin/migrateDB
===================================================================
--- trunk/tools/dbmigrate/bin/migrateDB	2010-04-13 19:42:49 UTC (rev 14500)
+++ trunk/tools/dbmigrate/bin/migrateDB	2010-04-13 21:28:28 UTC (rev 14501)
@@ -8,7 +8,7 @@
 my ($sourceUrl, $targetUrl, $debug);
 
 my $BASEDIR = dirname($0);
-my $LIBS = "-cp ../lib/dbunit-2.2.jar:../lib/mysql-connector-java-5.0.5-bin.jar:../lib/postgresql-8.1-407.jdbc3.jar:../lib/dbmigrate.jar";
+my $LIBS = "-cp $BASEDIR/../lib/dbunit-2.2.jar:$BASEDIR/../lib/mysql-connector-java-5.0.5-bin.jar:$BASEDIR/../lib/postgresql-8.1-407.jdbc3.jar:$BASEDIR/../lib/dbmigrate.jar";
 my $ARGS = "-Xms1536m -Xmx1536m";
 
 sub main() {
@@ -47,7 +47,7 @@
                "vmargs=s" => \$ARGS,
                "d" => \$debug,
                "debug" => \$debug) || printUsage() && exit(1);
-    if ($count == 0) {
+    if ($count == 0 || ($count == 1 && $debug)) {
         printUsage();
         exit(0);
     }
@@ -99,5 +99,6 @@
     print "$sp -g, --targeturl  => target mysql url (e.g. jdbc:mysql://localhost:3306/hqdb)\n";
     print "$sp -d, --debug      => prints debugging statetments to STDOUT\n";
     print "$sp --vmargs         => java vm args, default = \"$ARGS\"\n";
+    print "$sp ARGS             => $LIBS\n" if ($debug);
 }