--- bin/GetSyncID	2000/12/21 14:27:11	1.1.1.1
+++ bin/GetSyncID	2003/08/05 21:10:28	1.4
@@ -1,4 +1,4 @@
-# -*- perl -*-
+#!/usr/bin/perl -w
 # GetSyncID
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,38 +6,48 @@
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-use lib "@LIBDIR@";
+BEGIN {
+	my $basedir = $0; $basedir =~ s#/[^/]+$##;
+	unshift(@INC, "$basedir/../share");
+}
 
+use strict;
 use Pg;
 use Getopt::Long;
 use RServ;
 
 $| = 1;
 
-my $verbose = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose if (defined($opt_verbose));
+my ($debug,$verbose) = (0,1);
+my ($help,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb\n";
-    exit ((scalar(@ARGV) < 1)? 1: 0);
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
+	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 1)) {
+    print "Usage: $0 [options] slavedb table column
+Options:
+	--slavehost=hostname --slaveport=port
+	--slaveuser=username --slavepassword=string
+";
+    exit ((scalar(@ARGV) < 1)? 1:0);
 }
 
 my $dbname = $ARGV[0];
 
 my $sinfo = "dbname=$dbname";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
+$sinfo = "$sinfo host=$slavehost" if (defined($slavehost));
+$sinfo = "$sinfo port=$slaveport" if (defined($slaveport));
+$sinfo = "$sinfo user=$slaveuser" if (defined($slaveuser));
+$sinfo = "$sinfo password=$slavepassword" if (defined($slavepassword));
 
 print("Connecting to '$sinfo'\n") if ($debug || $verbose);
 my $conn = Pg::connectdb($sinfo);
 
-$res = GetSyncID($conn);
+my $res = GetSyncID($conn);
 
 die "ERROR\n" if $res < 0;