xloadt variability

diff --git a/config b/config
index bed6412082a90b6014c32d1bdefccc4a78da86db..4639ad581bff0ced860ec8a1b062a7bd1e77a2cf 100644 (file)
--- a/config
+++ b/config
@@ -1,6 +1,8 @@
 @@-
 @@-

-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 ?";
+
+$xbindir= '/usr/bin/X11';

 
 chomp($s= `uname`); $? and die "platform $?";
 if ($s =~ m/^Linux$/) {
 
 chomp($s= `uname`); $? and die "platform $?";
 if ($s =~ m/^Linux$/) {


@@ -14,6 +16,7 @@ if ($s =~ m/^Linux$/) {
     chomp($_= `uname -r`); $? and die "platform $?";
     m/^\d+\.\d+/ or die "$_ ?";
     $platform= "SunOS$&";
     chomp($_= `uname -r`); $? and die "platform $?";
     m/^\d+\.\d+/ or die "$_ ?";
     $platform= "SunOS$&";

+    $xbindir= '/usr/openwin/bin';

 } else {
     die "$s ?";
 }
 } else {
     die "$s ?";
 }


@@ -21,3 +24,4 @@ if ($s =~ m/^Linux$/) {
 $ncipher= $hostname =~ m/\.ncipher\.com$/ ? 'cam' :
           $hostname =~ m/\.ncipherusa\.com$/ ? 'bos' :
           0;
 $ncipher= $hostname =~ m/\.ncipher\.com$/ ? 'cam' :
           $hostname =~ m/\.ncipherusa\.com$/ ? 'bos' :
           0;

+

diff --git a/files/_.configs_setenvir b/files/_.configs_setenvir
index 2580c22b7ee675c675bda081d3d0b9add08c4d95..17ade711470f6cead17282233f82dce3bced1271 100755 (executable)
--- a/files/_.configs_setenvir
+++ b/files/_.configs_setenvir
@@ -6,7 +6,7 @@ PATH=$HOME/personal/@@$platform@@/bin:$HOME/personal/scripts/bin
 PATH=$PATH:$HOME/personal/linux-i386/crypto/scripts
 @@;@@#
 PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin
 PATH=$PATH:$HOME/personal/linux-i386/crypto/scripts
 @@;@@#
 PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin

-PATH=$PATH:/opt/bin:/usr/bin/X11
+PATH=$PATH:/opt/bin:@@$xbindir@@

 
 export PATH
 
 
 export PATH
 

diff --git a/files/personal_scripts_bin_xloadt b/files/personal_scripts_bin_xloadt
index 861a76ceb15b9dd31951cbee843debeb8ee4b088..6ec1de7281365560f7325e9166eb4d0c47d57caf 100755 (executable)
--- a/files/personal_scripts_bin_xloadt
+++ b/files/personal_scripts_bin_xloadt
@@ -3,4 +3,17 @@ hostname="`hostname | sed -e 's/\..*//'`"
 xlsclients | egrep \
  '[^ ]* xload -geometry [^ ]* -title '"'xload - $hostname'" \
  >/dev/null && exit 0
 xlsclients | egrep \
  '[^ ]* xload -geometry [^ ]* -title '"'xload - $hostname'" \
  >/dev/null && exit 0

-xload -geometry 120x120+302+0 -title "xload - $hostname"
+xload -geometry 120x120+@@
+
+@hostlist= ($ncipher eq 'bos' ? qw(viking dover pell arrakis) :
+            $ncipher eq 'cam' ? qw(jura) :
+            qw(davenant anarres));
+for ($i=0; $i<@hostlist; $i++) { last if $hostlist[$i] eq $nodename; }
+if ($i>=@hostlist) {
+    print STDERR "!! nodename $nodename not in $ncipher list @hostlist\n";
+    $i=-2;
+}
+
+302+141*$i;
+
+@@+0 -title "xload - $hostname"

diff --git a/gpt b/gpt
index 85246507b19249b77b95c185ee7cd52f6e6f1f29..5076cc2ea3c8682beeafd44825bdf717f1c81e2c 100755 (executable)
--- a/gpt
+++ b/gpt
@@ -123,7 +123,7 @@ sub process_input () {
            if ($l =~ m/\@\@(.|\n)/) {
                ($to,$op,$esc,$l) = ($`,$1,$&,$');
                add_text($to);
            if ($l =~ m/\@\@(.|\n)/) {
                ($to,$op,$esc,$l) = ($`,$1,$&,$');
                add_text($to);

-               if ($op =~ m/[-< \$?]/) {
+               if ($op =~ m/[-< \$?\n]/) {

                    $substr.= $esc if @oplist;
                    push @oplist, $op;
                    add_perl($op) if $op =~ m/[\$]/;
                    $substr.= $esc if @oplist;
                    push @oplist, $op;
                    add_perl($op) if $op =~ m/[\$]/;

diff --git a/misc/Makefile b/misc/Makefile
index f24f08e8891bddb70288a8a48e1030456f297918..d9649c2fd2822d9999f982b7fd2531352e7a7e8b 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,6 +1,6 @@
 INSTALLDIR=    $(HOME)/bin
 
 INSTALLDIR=    $(HOME)/bin
 

-TARGETS=       with-lock-ex
+TARGETS=       with-lock-ex close3onwards

 
 CPPFLAGS=      $(OPTIONS)
 CFLAGS=                $(OPTIMISE)
 
 CPPFLAGS=      $(OPTIONS)
 CFLAGS=                $(OPTIMISE)

diff --git a/perms b/perms
index 66f7fab5095b65764ee42ff9ffbabb544e5e4a6e..282385f05586b4bb07fff5a383200e86fbfe7e7d 100644 (file)
--- a/perms
+++ b/perms
@@ -3,6 +3,7 @@
 .configs/checkconfig                   +x
 .configs/chiarks                       +x
 .configs/configure                     +x
 .configs/checkconfig                   +x
 .configs/chiarks                       +x
 .configs/configure                     +x

+.configs/rxprofile                     +x

 .configs/startemacs                    +x
 .configs/x11start                      +x
 .configs/xbiffs                                +x
 .configs/startemacs                    +x
 .configs/x11start                      +x
 .configs/xbiffs                                +x

diff --git a/showresult b/showresult
index d630ba3dc3ae1a041f42eaa0795e06639dd41ef7..ed6e397514b994a72094a35d5226fa53417a82c1 100644 (file)
--- a/showresult
+++ b/showresult
@@ -1,3 +1,4 @@
 platform @@$platform@@
 platform @@$platform@@

+nodename @@$nodename@@

 hostname @@$hostname@@
 ncipher  @@$ncipher@@
 hostname @@$hostname@@
 ncipher  @@$ncipher@@