X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcreate_sysop.pl;h=d600ec6ee623515082fc2f113062882d534d3e85;hb=dea6cbc282b2c101672139c9369af8c9bba7122e;hp=4696fc2e505633f723568594e363a60f43a7bf64;hpb=ab568d677a2d2243eabee315b3e609c4ea4f73a0;p=spider.git

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index 4696fc2e..d600ec6e 100755
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -11,70 +11,99 @@
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
-  # root of directory tree for this system
-  $root = "/spider"; 
-  $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+	# root of directory tree for this system
+	$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";
 }
 
 use DXVars;
 use DXUser;
 
+sub delete_it
+{
+	DXUser->del_file($userfn);
+}
+
 sub create_it
 {
-  system("rm -f $userfn*");
-  DXUser->init($userfn);
-  my $self = DXUser->new($mycall);
-  $self->{alias} = $myalias;
-  $self->{name} = $myname;
-  $self->{qth} = $myqth;
-  $self->{qra} = $mylocator;
-  $self->{lat} = $mylatitude;
-  $self->{long} = $mylongtitude;
-  $self->{email} = $myemail;
-  $self->{bbsaddr} = $mybbsaddr;
-  $self->{homenode} = $mycall;
-  $self->{sort} = 'A';           # C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
-  $self->{priv} = 9;             # 0 - 9 - with 9 being the highest
-  $self->{lastin} = 0;
-  $self->{dxok} = 1;
-  $self->{annok} = 1;
+	my $ref = DXUser->get($mycall);
+	$ref->del() if $ref;
+	
+	my $self = DXUser->new($mycall);
+	$self->{alias} = $myalias;
+	$self->{name} = $myname;
+	$self->{qth} = $myqth;
+	$self->{qra} = $mylocator;
+	$self->{lat} = $mylatitude;
+	$self->{long} = $mylongitude;
+	$self->{email} = $myemail;
+	$self->{bbsaddr} = $mybbsaddr;
+	$self->{homenode} = $mycall;
+	$self->{sort} = 'A';		# C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
+	$self->{priv} = 9;			# 0 - 9 - with 9 being the highest
+	$self->{lastin} = 0;
+	$self->{dxok} = 1;
+	$self->{annok} = 1;
+
+	# write it away
+	$self->close();
 
-  # write it away
-  $self->close();
+	# now do one for the alias
+	$ref = DXUser->get($myalias);
+	$ref->del() if $ref;
 
-  # now do one for the alias
-  $self = DXUser->new($myalias);
-  $self->{name} = $myname;
-  $self->{qth} = $myqth;
-  $self->{qra} = $mylocator;
-  $self->{lat} = $mylatitude;
-  $self->{long} = $mylongtitude;
-  $self->{email} = $myemail;
-  $self->{bbsaddr} = $mybbsaddr;
-  $self->{homenode} = $mycall;
-  $self->{sort} = 'U';           # C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
-  $self->{priv} = 9;             # 0 - 9 - with 9 being the highest
-  $self->{lastin} = 0;
-  $self->{dxok} = 1;
-  $self->{annok} = 1;
-  $self->{lang} = 'en';
+	$self = DXUser->new($myalias);
+	$self->{name} = $myname;
+	$self->{qth} = $myqth;
+	$self->{qra} = $mylocator;
+	$self->{lat} = $mylatitude;
+	$self->{long} = $mylongitude;
+	$self->{email} = $myemail;
+	$self->{bbsaddr} = $mybbsaddr;
+	$self->{homenode} = $mycall;
+	$self->{sort} = 'U';		# C - Console user, S - Spider cluster, A - AK1A, U - User, B - BBS
+	$self->{priv} = 9;			# 0 - 9 - with 9 being the highest
+	$self->{lastin} = 0;
+	$self->{dxok} = 1;
+	$self->{annok} = 1;
+	$self->{lang} = 'en';
   
-  # write it away
-  $self->close();
+	# write it away
+	$self->close();
 
-  DXUser->finish();
-  print "New user database created as $userfn\n";
+}
+
+$lockfn = "$root/perl/cluster.lck";       # lock file name
+if (-e $lockfn) {
+	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
+	my $pid = <CLLOCK>;
+	chomp $pid;
+	die "Sorry, Lockfile ($lockfn) and process $pid exist, a cluster is running\n" if kill 0, $pid;
+	close CLLOCK;
 }
 
 if (-e "$userfn") {
-  print "This program will destroy your user database!!!!\n\nDo you wish to continue [y/N]: ";
-  $ans = <STDIN>;
-  create_it() if ($ans =~ /^[Yy]/);
+	print "Do you wish to destroy your user database (THINK!!!) [y/N]: ";
+	$ans = <STDIN>;
+	if ($ans =~ /^[Yy]/) {
+		delete_it();
+		DXUser->init($userfn, 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);
+			create_it();
+		}
+	}
+  
 } else {
-  create_it();
+	DXUser->init($userfn, 1);
+	create_it();
 }
+DXUser->finish();
 exit(0);