X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcreate_sysop.pl;h=0ec29039acd90065efc1331b1e978b52df17d5f1;hb=6951e5c6623c813b5f3da77796aa22c7e0848e44;hp=622bc05656052a05edb19b2c30daf5839d7fb3dc;hpb=4eef5ad5a1da19f091f3c6f1e50c60772db40a4c;p=spider.git

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index 622bc056..0ec29039 100755
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -15,9 +15,12 @@ BEGIN {
 	$root = "/spider"; 
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+	unshift @INC, "$root/perl"; # this IS the right way round!
 	unshift @INC, "$root/local";
 }
 
+package main;
+
 use DXVars;
 use DXUser;
 
@@ -28,7 +31,7 @@ sub delete_it
 
 sub create_it
 {
-	my $ref = DXUser->get(uc $mycall);
+	my $ref = DXUser::get(uc $mycall);
 	$ref->del() if $ref;
 	
 	my $self = DXUser->new(uc $mycall);
@@ -51,7 +54,7 @@ sub create_it
 	$self->close();
 
 	# now do one for the alias
-	$ref = DXUser->get(uc $myalias);
+	$ref = DXUser::get(uc $myalias);
 	$ref->del() if $ref;
 
 	$self = DXUser->new(uc $myalias);
@@ -76,6 +79,8 @@ sub create_it
 
 }
 
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
 $lockfn = "$root/local/cluster.lck";       # lock file name
 if (-e $lockfn) {
 	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
@@ -85,9 +90,9 @@ if (-e $lockfn) {
 	close CLLOCK;
 }
 
-$DXUser::v3 = 1;
+$DXUser::v4 = 1;
 
-if (-e "$userfn.v2" || -e "$userfn.v3") {
+if (-e "$userfn.v2" || -e "$userfn.v3" ||-e "$userfn.v4")  {
 	print "Do you wish to destroy your user database (THINK!!!) [y/N]: ";
 	$ans = <STDIN>;
 	if ($ans =~ /^[Yy]/) {
@@ -107,6 +112,7 @@ if (-e "$userfn.v2" || -e "$userfn.v3") {
 	DXUser->init($userfn, 1);
 	create_it();
 }
+DXUser->sync;
 DXUser->finish();
 exit(0);