X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcreate_sysop.pl;h=99f3e0600d7b045177fb1d934df281c9f6881fb7;hb=refs%2Fheads%2Fstaging;hp=622bc05656052a05edb19b2c30daf5839d7fb3dc;hpb=4eef5ad5a1da19f091f3c6f1e50c60772db40a4c;p=spider.git

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index 622bc056..99f3e060 100755
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # create a NEW user database and the sysop record
 #
@@ -15,20 +15,23 @@ 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";
 }
 
 use DXVars;
+use SysVar;
 use DXUser;
+use DXUtil;
 
 sub delete_it
 {
-	DXUser->del_file($userfn);
+	DXUser::del_file();
 }
 
 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,7 +79,9 @@ sub create_it
 
 }
 
-$lockfn = "$root/local/cluster.lck";       # lock file name
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
+$lockfn = "$main::local_data/cluster.lck";       # lock file name (now in local data)
 if (-e $lockfn) {
 	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 	my $pid = <CLLOCK>;
@@ -92,21 +97,21 @@ if (-e "$userfn.v2" || -e "$userfn.v3") {
 	$ans = <STDIN>;
 	if ($ans =~ /^[Yy]/) {
 		delete_it();
-		DXUser->init($userfn, 1);
+		DXUser::init(1);
 		create_it();
 	} else {
 		print "Do you wish to reset your cluster and sysop information? [y/N]: ";
 		$ans = <STDIN>;
 		if ($ans =~ /^[Yy]/) {
-			DXUser->init($userfn, 1);
+			DXUser::init(1);
 			create_it();
 		}
 	}
   
 } else {
-	DXUser->init($userfn, 1);
+	DXUser::init(1);
 	create_it();
 }
-DXUser->finish();
+DXUser::finish();
 exit(0);