X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=config;h=d618ababab8e3ac8cbfd99c17e6bef28217abe82;hp=a3bc0b0074af37194c7775b36755b5bf85a22b3f;hb=637096da9d5b229831b2bf3c774f78a477062464;hpb=595ba66866b5cb3557094fd4d2899b1db0580af1

diff --git a/config b/config
index a3bc0b0..d618aba 100644
--- a/config
+++ b/config
@@ -1,28 +1,49 @@
 @@-
-chomp($nodename= `uname -n`); $? and die 'uname $?';
-($hostname)=(gethostbyname $nodename) or die "hostname $nodename ?";
-$nodename =~ s/\..*//;
+chomp($nodename= `uname -n`); $? and die "uname $?";
+chomp($username= `whoami`); $? and die "whoami $?";
+
+@he= gethostbyname $nodename or die "gethostbyname $nodename ?";
+@hostnames= ($he[0], split /\s/, $he[1]);
+($hostname)= grep /\./, @hostnames or die "no fqdn in @hostnames";
 
+$nodename =~ s/\..*//;
 $xbindir= '/usr/bin/X11';
 
-chomp($s= `uname`); $? and die "platform $?";
-if ($s =~ m/^Linux$/) {
+chomp($uname= `uname`); $? and die "platform $?";
+if ($uname =~ m/^Linux$/) {
     chomp($_= `uname -m`); $? and die "platform $?";
     if (m/^i\d86/) {
 	$platform= 'linux-i386';
     } else {
 	die "$_ ?";
     }
-} elsif ($s =~ m/^SunOS$/) {
+} elsif ($uname =~ m/^SunOS$/) {
     chomp($_= `uname -r`); $? and die "platform $?";
     m/^\d+\.\d+/ or die "$_ ?";
     $platform= "SunOS$&";
     $xbindir= '/usr/openwin/bin';
+} elsif ($uname =~ m/^FreeBSD/) {
+    chomp($_= `uname -r`); $? and die "platform $?";
+    m/^(\d+\.\d+)\-/ or die "$_ ?";
+    $platform= "FreeBSD-$1";
+    $xbindir= '/usr/X11R6/bin';
+} elsif ($uname =~ m/^HP\-UX/) {
+    chomp($_= `uname -r`); $? and die "platform $?";
+    m/^B\.(\d+\.\d+)$/ or die "$_ ?";
+    $platform= "HP-UX$1";
+} elsif ($uname =~ m/^AIX/) {
+    chomp($_= `uname -rv`); $? and die "platform $?";
+    m/^\d+ (\d+)$/ or die "$_ ?";
+    $platform= "AIX$1";
 } else {
-    die "$s ?";
+    die "$uname ?";
 }
 
-$ncipher= $hostname =~ m/\.ncipher\.com$/ ? 'cam' :
-          $hostname =~ m/\.ncipherusa\.com$/ ? 'bos' :
+$ncipher= $hostname =~ m/\.(ncipher\.com$)/    ? 'cam' :
+          $hostname =~ m/\.(ncipherusa\.com$)/ ? 'bos' :
           0;
 
+$chiark=  $hostname =~ m/chiark/;
+
+%ncipherdom= ('cam' => 'ncipher.com',
+	      'bos' => 'ncipherusa.com');