X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=config;h=b150190edbaf73f5a9d6f58a2a4343d0a1dc033d;hb=89fd0e79f8a0e6c43c64a115a6235fa5ce041cd0;hp=d9d49e651058ab534de54114c0cc2148219bfe81;hpb=0c863672d721034d3d63ba62afe8857ea0308cf3;p=ian-dotfiles.git

diff --git a/config b/config
index d9d49e6..b150190 100644
--- a/config
+++ b/config
@@ -1,17 +1,30 @@
 @@-
-chomp($hostname= `uname -n`); $? and die 'uname $?';
-($hostname)=(gethostbyname $hostname) or die "hostname $hostname ?";
+chomp($nodename= `uname -n`); $? and die 'uname $?';
+($hostname)=(gethostbyname $nodename) or die "hostname $nodename ?";
+$nodename =~ s/\..*//;
 
-chomp($s= `uname`); $? and die 'platform $?';
-if ($s =~ m/^Linux$/) {
-    chomp($_= `uname -m`); $? and die 'platform $?';
+$xbindir= '/usr/bin/X11';
+
+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 '$_ ?';
+	die "$_ ?";
     }
+} elsif ($uname =~ m/^SunOS$/) {
+    chomp($_= `uname -r`); $? and die "platform $?";
+    m/^\d+\.\d+/ or die "$_ ?";
+    $platform= "SunOS$&";
+    $xbindir= '/usr/openwin/bin';
+} else {
+    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;
+
+%ncipherdom= ('cam' => 'ncipher.com',
+	      'bos' => 'ncipherusa.com');