Allow synonyms for localhost

[spider.git] / perl / create_sysop.pl

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index c59358b612dea4efa99f2e44e555617c4ca83bcf..99f3e0600d7b045177fb1d934df281c9f6881fb7 100755 (executable)
--- 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,15 +15,18 @@ 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
@@ -78,7 +81,7 @@ 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
+$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>;
@@ -94,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);