X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fupdate_sysop.pl;h=e7225c7c3c65ba49574426e2d58859a9dc863c17;hb=c94ff1bf2cbe16ed59c5b273c7f6730fd7314cab;hp=cec9f56ec04757c7e32e70f7dbed105d28f26b80;hpb=4eef5ad5a1da19f091f3c6f1e50c60772db40a4c;p=spider.git

diff --git a/perl/update_sysop.pl b/perl/update_sysop.pl
index cec9f56e..e7225c7c 100755
--- a/perl/update_sysop.pl
+++ b/perl/update_sysop.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # remove all records with the sysop/cluster callsign and recreate
 # it from the information contained in DXVars
@@ -22,14 +22,15 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
-use DXVars;
+use SysVar;
 use DXUser;
+use DXUtil;
 
 sub create_it
 {
 	my $ref;
 	
-	while ($ref = DXUser->get(uc $mycall)) {
+	while ($ref = DXUser::get(uc $mycall)) {
 		print "old call $mycall deleted\n";
 		$ref->del();
 	}
@@ -55,7 +56,7 @@ sub create_it
 	print "new call $mycall added\n";
 
 	# now do one for the alias
-	while ($ref = DXUser->get($myalias)) {
+	while ($ref = DXUser::get($myalias)) {
 		print "old call $myalias deleted\n";
 		$ref->del();
 	}
@@ -83,7 +84,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 = localdata("cluster.lck");       # lock file name
 if (-e $lockfn) {
 	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 	my $pid = <CLLOCK>;
@@ -92,9 +95,9 @@ if (-e $lockfn) {
 	close CLLOCK;
 }
 
-DXUser->init($userfn, 1);
+DXUser::init(1);
 create_it();
-DXUser->finish();
+DXUser:finish();
 print "Update of $myalias on cluster $mycall successful\n";
 exit(0);