Changeset 5186

Timestamp:

Sep 29, 2005, 11:28:33 AM (21 years ago)

Author:

jhoblitt

Message:

env vars should be checked only if the cli option is missing

Location:

trunk/PS-IPP-MetaDB/scripts

Files:

• mdb-add-new (modified) (3 diffs)
• mdb-new2newed (modified) (3 diffs)

trunk/PS-IPP-MetaDB/scripts/mdb-add-new

@@ -3 +3 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: mdb-add-new,v 1.3 2005-09-29 21:18:25 jhoblitt Exp $
+# $Id: mdb-add-new,v 1.4 2005-09-29 21:28:33 jhoblitt Exp $
 
 use strict;
@@ -16 +16 @@
 use Pod::Usage qw( pod2usage );
 
+my ($exp_id, $class_id, $camera, $class, $url);
 my ($dsn, $dbuser, $dbpass);
-
-$dsn    = $ENV{'MDB_DSN'} unless $dsn;
-$dbuser = $ENV{'MDB_USER'} unless $dbuser;
-$dbpass = $ENV{'MDB_PASS'} unless $dbpass;
-
-my ($exp_id, $class_id, $camera, $class, $url);
 
 GetOptions(
@@ -34 +29 @@
     'url=s'     => \$url,
 ) || pod2usage( 2 );
+
+$dsn    = $ENV{'MDB_DSN'} unless $dsn;
+$dbuser = $ENV{'MDB_USER'} unless $dbuser;
+$dbpass = $ENV{'MDB_PASS'} unless $dbpass;
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;

trunk/PS-IPP-MetaDB/scripts/mdb-new2newed

@@ -3 +3 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: mdb-new2newed,v 1.2 2005-09-29 21:18:25 jhoblitt Exp $
+# $Id: mdb-new2newed,v 1.3 2005-09-29 21:28:33 jhoblitt Exp $
 
 use strict;
@@ -16 +16 @@
 use Pod::Usage qw( pod2usage );
 
+my ($exp_id, $class_id, $url);
 my ($dsn, $dbuser, $dbpass);
-
-$db     = $ENV{'MDB_DB'} unless $db;
-$dbuser = $ENV{'MDB_USER'} unless $dbuser;
-$dbpass = $ENV{'MDB_PASS'} unless $dbpass;
-
-my ($exp_id, $class_id, $url);
 
 GetOptions(
@@ -32 +27 @@
     'url=s'     => \$url,
 ) || pod2usage( 2 );
+
+$db     = $ENV{'MDB_DB'} unless $db;
+$dbuser = $ENV{'MDB_USER'} unless $dbuser;
+$dbpass = $ENV{'MDB_PASS'} unless $dbpass;
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;