projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge PC34 unbless ref changes from main line
[spider.git]
/
perl
/
create_sysop.pl
diff --git
a/perl/create_sysop.pl
b/perl/create_sysop.pl
index fbfc776481c3b65a92e1f656706a12253fc68831..0ec29039acd90065efc1331b1e978b52df17d5f1 100755
(executable)
--- a/
perl/create_sysop.pl
+++ b/
perl/create_sysop.pl
@@
-6,7
+6,7
@@
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
# make sure that modules are searched in the order local then perl
#
# make sure that modules are searched in the order local then perl
@@
-15,9
+15,12
@@
BEGIN {
$root = "/spider";
$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
$root = "/spider";
$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+ unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
}
unshift @INC, "$root/local";
}
+package main;
+
use DXVars;
use DXUser;
use DXVars;
use DXUser;
@@
-28,7
+31,7
@@
sub delete_it
sub create_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);
$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
$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);
$ref->del() if $ref;
$self = DXUser->new(uc $myalias);
@@
-69,13
+72,16
@@
sub create_it
$self->{dxok} = 1;
$self->{annok} = 1;
$self->{lang} = 'en';
$self->{dxok} = 1;
$self->{annok} = 1;
$self->{lang} = 'en';
+ $self->{group} = [qw(local #9000)];
# write it away
$self->close();
}
# write it away
$self->close();
}
-$lockfn = "$root/perl/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 = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
@@
-84,7
+90,9
@@
if (-e $lockfn) {
close CLLOCK;
}
close CLLOCK;
}
-if (-e "$userfn") {
+$DXUser::v4 = 1;
+
+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]/) {
print "Do you wish to destroy your user database (THINK!!!) [y/N]: ";
$ans = <STDIN>;
if ($ans =~ /^[Yy]/) {
@@
-104,6
+112,7
@@
if (-e "$userfn") {
DXUser->init($userfn, 1);
create_it();
}
DXUser->init($userfn, 1);
create_it();
}
+DXUser->sync;
DXUser->finish();
exit(0);
DXUser->finish();
exit(0);