X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=config;h=b150190edbaf73f5a9d6f58a2a4343d0a1dc033d;hb=be98b851a91a5a96b61c2235a49163cabeb57585;hp=c1e03623408ad0d451aa72981b98c8b46413165f;hpb=e447a1fef98b3b591d4a4684b70f1925f77cc54e;p=ian-dotfiles.git diff --git a/config b/config index c1e0362..b150190 100644 --- a/config +++ b/config @@ -5,21 +5,21 @@ $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'; } else { - die "$s ?"; + die "$uname ?"; } $ncipher= $hostname =~ m/\.(ncipher\.com$)/ ? 'cam' :