updates from ian@chiark

diff --git a/config b/config
index eaaeb82947be4e64b42ff73085ec5a3a6c3f4d94..d618ababab8e3ac8cbfd99c17e6bef28217abe82 100644 (file)
--- a/config
+++ b/config
@@ -43,5 +43,7 @@ $ncipher= $hostname =~ m/\.(ncipher\.com$)/    ? 'cam' :
           $hostname =~ m/\.(ncipherusa\.com$)/ ? 'bos' :
           0;
 
+$chiark=  $hostname =~ m/chiark/;
+
 %ncipherdom= ('cam' => 'ncipher.com',
              'bos' => 'ncipherusa.com');

diff --git a/files/_.bashrc b/files/_.bashrc
index e61c90aaa6c0b3cf0ccb3e32ca93f7c3abc8e305..6f136dbc43fc4431a456abb0b728552e7fa49585 100644 (file)
--- a/files/_.bashrc
+++ b/files/_.bashrc
@@ -5,41 +5,22 @@ hostname_completion_file=~/.hosts
 export PWD
 
 # My own functions
-ls() { /bin/ls -FC "$@" ; }
-ll() { /bin/ls -FClag "$@" ; }
+ls() { /bin/ls -FC "$@"; }
+ll() { /bin/ls -FClag "$@"; }
 setprompt() { PS1=`autotitle`; export PS1; }
 rs() { eval `/usr/openwin/bin/resize` ; setprompt ; }
 cd() { builtin cd "$@"; setprompt; }
 pu() { builtin pushd "$@"; setprompt; }
 po() { builtin popd "$@"; setprompt; }
 
-# newgrp() { 
-#      NEWGRPSHELL="${LOGINSHELL:-}"; export NEWGRPSHELL
-#      exec /bin/newgrp $*
-# }
-
-setenv () {
-       varname=`echo $1 | tr '[a-z]' '[A-Z]'`
-       eval "$varname=\"$2\"" ; export $varname ;
-}
-
-# if [ "${NEWGRPSHELL:-}" ]
-# then
-#      unset NEWGRPSHELL
-#      LOGINSHELL=true
-# fi
-
 # Set up history and prompt
 if [ "$PS1" ]
 then
        HISTFILE=$HOME/.history/$HOST~$$~
-       AUTOTITLE_STDOUT="${LOGINSHELL:+-}%?u%U%!%?g(%G)%!%?u@%!%h:%d1~.> "
+       AUTOTITLE_STDOUT="@@?
+ $chiark && $username eq 'ian' ?@@-@@;%?u%U%!%?g(%G)%!%?u@%!%h:%d1~.> "
        AUTOTITLE_WINDOW="%h - %d~. %Y.[U..[M..[D./..%X.L]..M]..R]./.. %U%?G(%G)%!"
        AUTOTITLE_ICON="%h: %d3~. %Y.[U..[M..[D./..%X.L]..M]..R]./.."
        export AUTOTITLE_STDOUT AUTOTITLE_WINDOW AUTOTITLE_ICON
        setprompt
 fi
-
-# Set up the terminal:
-# stty new intr '^c' erase '^?' kill '^x' susp '^z' dsusp '^y' eof '^d' \
-#      hupcl ixon ixoff -tostop quit '^\' 2>/dev/null

diff --git a/files/_.configs_Xresources b/files/_.configs_Xresources
index b250b019a0c11c49899eec76ed31636fcfcd7854..4dbf5b5f853b350cd4c2e4defb8cd239f36b2500 100644 (file)
--- a/files/_.configs_Xresources
+++ b/files/_.configs_Xresources
@@ -6,6 +6,13 @@ epoch.nonlocal.minibuf:                 false
 
 xv*geometry:                   +10+10
 
+wish*foreground:               grey90
+wish*background:               grey25
+wish*activeForeground:         white
+wish*activeBackground:         grey35
+wish*disabledForeground:       black
+wish*disabledBackground:       grey25
+
 povray*geometry:               +40+10
 povray*background:             black
 povray*foreground:             black

diff --git a/files/_.configs_setenvir b/files/_.configs_setenvir
index 9ee8688267b214a0c817e22b84c6d897ede15607..33c1f29e47bcfb74acba29eac2841de9c5ef11ce 100755 (executable)
--- a/files/_.configs_setenvir
+++ b/files/_.configs_setenvir
@@ -2,31 +2,52 @@
 # Set up the environment:
 
 PATH=$HOME/personal/@@$platform@@/bin:$HOME/personal/scripts/bin
-@@?$ncipher?@@@@#
+
+@@?$ncipher?@@
 PATH=$PATH:$HOME/personal/crypto/scripts
-@@;@@#
-@@? -d '/opt/bin' ?@@@@#
+@@;
+
+@@? -d '/opt/bin' ?@@
 PATH=$PATH:/opt/bin
-@@;@@#
-@@? $uname eq 'HP-UX' ?@@@@#
+@@;
+
+@@? $uname eq 'HP-UX' ?@@
 PATH=$PATH:/usr/contrib/bin
-@@;@@#
+@@;
+
 PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin
-@@? $uname eq 'SunOS' ?@@@@#
+
+@@? $uname eq 'SunOS' ?@@
 PATH=$PATH:/usr/ccs/bin
-@@;@@#
-@@? $uname eq 'AIX' ?@@@@#
+@@;
+
+@@? $uname eq 'AIX' ?@@
 PATH=$PATH:/usr/vac/bin
-@@;@@#
+@@;
+
 PATH=$PATH:@@$xbindir@@
 
 export PATH
 
 CDPATH=:..:$HOME:$HOME/things
 CVS_RSH=ssh
+
+unset MAILPATH
+
+@@?$ncipher?@@
 CVSROOT=:ext:cvs:/ncipher/local-CVS
+@@;
+
+@@?$chiark?@@
+CVSROOT=/usr/src/CVS
+NNTPAUTH="md5cookie1way ian"
+MAILPATH=/var/spool/mail/@@$username@@:$HOME/mail/SINBOX.DROP
+ORGANIZATION="Linux Unlimited"
+
+export MAILPATH NNTPAUTH ORGANISATION
+@@;
+
 EDITOR=emacs
-ESHELL=/usr/bin/bash
 HISTORY=256
 HOST=`hostname`
 LANG=C
@@ -48,7 +69,6 @@ NC_SITES=@@$ncipher@@:@@ $ncipher eq 'bos' ? 'cam' : 'bos' @@
 export NC_SITES
 @@;
 
-unset MAILPATH
 unset ignoreeof
 
 umask 002

diff --git a/files/_.configs_x11start b/files/_.configs_x11start
index 3e259036627f431e2d508a95e75f8b0f843386d2..00fc4b27980a703ec7b25315945dbf86b31118b5 100755 (executable)
--- a/files/_.configs_x11start
+++ b/files/_.configs_x11start
@@ -1,43 +1,34 @@
-#!/bin/bash
+#!/bin/sh
 
 eval `.configs/configure`
 
 >".counters/v.$DISPLAY"
 
-# if [ $xauth = true ]
-# then
-#      nice -15 sh -c '
-#   xhost | perl -ne "s//xhost\t-/; print unless m/ /;" | sh 2>&1 \
-#         | perl -pe "s/^\S+ being removed from access control list\s+\$/-/";
-#        xhost -
-#      ' &
-# fi
-
 echo -n 'starting clients '
 
+#       xsetroot -fg '#883030' -bg '#204050' -bitmap bitmap/root
+#       xsetroot -cursor bitmap/circle bitmap/circle-inv -fg white -bg black
+#        xset b 75 300
+#if [ "x$1" != "xnotwm" ]; then
+# echo -n . ;   twm &
+#fi
+#echo -n . ;    xload &
+#echo -n . ;    xterm -n 'xterm d' -T xterm -geometry 80x25+0-10 &
+#echo -n . ;    emacs -f make-session &
+#echo -n . ;    unclutter -noevents &
+#echo -n . ;    xbiff -name xbiffs & xbiff & xbiff -name xbiff2 &
+#echo -n . ;    stty -isig
+#echo -n . ;    (while cat /dev/xconsole; do sleep 10; done) & sleep 1
+#really start-stop-daemon --stop --exec /usr/bin/X11/xconsole --user root --quie
+#
+#echo    . ;     exec xclock
+
 echo -n .
 
 sh .configs/x11start-colours=$colours
 
 echo -n .
 
-# if [ "x$chost" = x ]
-# then
-#      .configs/xclients &
-#      $echo -n .
-#         if [ "x$HOST" != xleek ]
-#         then
-#              xrsh leek /usr/bin/X11/xload -geometry 120x120+34+0 &
-#      fi
-# else
-#      $brokenserver && xhost +$chost +quince
-#      cat .configs/setenvir - .configs/xclients <<END | rsh $chost sh &
-#              DISPLAY=$display:0 export DISPLAY
-# END
-#      /usr/bin/X11/xload -geometry 120x120+34+0 &
-#      $echo -n .
-# fi
-
 .configs/xclients &
 # /usr/bin/X11/xload -geometry 120x120+34+0 &
 

diff --git a/files/_.configs_xclients b/files/_.configs_xclients
index c70bf0be27f216a21dc92bc73bc28234c141a889..b2d23f4f5bff6c9949fefdab48a18b595af92eb3 100755 (executable)
--- a/files/_.configs_xclients
+++ b/files/_.configs_xclients
@@ -16,20 +16,13 @@ echo -n :
 
 xterm -n 'xterm d' -T xterm -geometry 80x25+0-10 &
 
+@@?!$chiark?@@
 .configs/chiarks
+@@;
 
+@@?$ncipher?@@
 remoteshell -rrsh keynes -geometry 80x25+172+159 &
-
-echo -n :
-#
-#xbiff &
-
-# xab -iconic &
-# perl -e '$xab="xab"; exec $xab "other-xab"' &
-
-echo -n :
-
-remoteshell -rrsh dover -geometry 80x25-0-71
+@@;
 
 .configs/xbiffs
 

diff --git a/files/_.configs_xprofile b/files/_.configs_xprofile
index ec8b46f9e00ae6ea3b7ad6866f06738ad2dd888e..2a5ba1d3c1dee758023bb8a3b7bffcc9254dba64 100755 (executable)
--- a/files/_.configs_xprofile
+++ b/files/_.configs_xprofile
@@ -6,7 +6,7 @@
 # to cus.cam.ac.uk.
 
 echo '\e[10;0H'
-#(hidebackups &)
+
 echo -n 'Hit return for windows... '
 read inputline
 if [ "x$inputline" = x ]

diff --git a/files/_.lynxrc b/files/_.lynxrc
index 753fca6a52c4a08487f310c06f9fb41f84fb39bf..e0baf23c2396bf506798d375ae717f9e6f336034 100644 (file)
--- a/files/_.lynxrc
+++ b/files/_.lynxrc
@@ -183,7 +183,7 @@ vi_keys=off
 #   ^N = down    ^P = up
 #   ^B = left    ^F = right
 # will be enabled.
-emacs_keys=off
+emacs_keys=on
 
 # show_dotfiles specifies that the directory listing should include
 # "hidden" (dot) files/directories.  If set "on", this will be

diff --git a/files/_.profile b/files/_.profile
index 73a522b72af6efb1b3a3259e38b0fce25dae542e..7cc97b96b24c475bffbdf0ca173d5617bbb5680f 100755 (executable)
--- a/files/_.profile
+++ b/files/_.profile
@@ -1,8 +1,4 @@
-# Ian Jackson's .profile, mostly copied from.... (eng.cam.ac.uk)
-# CUED default .profile for /bin/sh or /bin/ksh initialization,
-# then customised for Engineering dept system. This version copied
-# to cl then customised for cl, thence to cam-orl.co.uk, thence
-# to chiark, thence to ncipher
+# Ian Jackson's .profile now in CVS
 
 . .configs/setenvir
 

diff --git a/files/_.ssh_authorized__keys b/files/_.ssh_authorized__keys
index 700ebcb64db5e2bb474e0b7a45f1c0647021864a..b98d608792c739dc3629f2d34cc52cea63a96966 100644 (file)
--- a/files/_.ssh_authorized__keys
+++ b/files/_.ssh_authorized__keys
@@ -5,5 +5,5 @@
 1024 35 155700069287664501281681012869914271738712974299223445134728148917038244934339506504036512587991354975597079464444531884524081235753658398521680648485217523189744866663620343244202894740688556556622894141027300629903247301893674346724263212189132860262301370559174882976578675034232773283098826237416726866517 iwj@newry
 1024 35 167024110043807390607791306968454709497383749367015887174525332872314230930819309173928755814031476357971033137981565695750851881200107954702727545222482244305854125457318066584672832766743125764695178980303010103131554068164375735120099921543449674127090714858103433637118604657374828557743842903894941567989 iwj@glastonbury
 @@:@@#
-1024 33 117385851636815625794682045272670348226429528350378659864768391051250351542749258151009620656468243493947746468877869045185455056624320499676925131648425561713585082385383007825961112176954557838606529291118468652728777501137394895737487546704720843287182661898072134181879704222022988749029714875365204438999 ian@anarres
+ssh-dss AAAAB3NzaC1kc3MAAACBAJijbPuhQjRlFW3q1aSakxzxjt2Im88MUQHwnBlFWNdnTiB8A4rXs6uq/XiF/NMf2SsgYxyVSps33t/fSIYs+cg17TCXHvznD4MUc0imk05wKPVLVVKrUJ89KeB3fa5s/1kU7FDqTiglpwx8dla7ZxAkWfnrr6y+lG6MTs7EoptRAAAAFQDXqO1IrImPCFPVEZsr9Mr6ytv4PwAAAIBXCSOIyMdfxdfRYRS+m/Xz7ayvS6K4XSe2n1UtzGRA+eFTPljFnxGJ5pin8cs/HhfDq5cRHCl4c8aXNDuX6weC1HBiNlWC72fqf2rg/oPpfr1lf/psP72qnaohdxgif0+vHr+XkAdvmIJbveZjEbfR/BGm3clPZBOfBW2jcJFJ0AAAAIBDjN08EurM7/fUuEY5o+3XmK4mjE5ItBzDLAXm3M5jzJSDqE71paDYm8/T/rBk+epJXNt0/pU+ncAPnntAts/9NY7nO4+ZyYU6rWtmylhGrDZVgIOsmJ8ctzlf5h4WYseoT4UdKqZzQnLIqVulN3XBpOCj67zt+hmR13CGOfyVsw== ian@davenant
 @@;@@#

diff --git a/files/_.w3m_config b/files/_.w3m_config
index 674ffb909e399c9f7529cc6a62e9184a782f66b7..1d0e9ba557d4c32332feb7e1de445bfc5f4e4b6e 100644 (file)
--- a/files/_.w3m_config
+++ b/files/_.w3m_config
@@ -17,3 +17,8 @@ multicol 0
 display_link 1
 frame 1
 tabstop 8
+@@?$chiark?@@@@#
+http_proxy http://www-cache.chiark.greenend.org.uk:3128/
+gopher_proxy http://www-cache.chiark.greenend.org.uk:3128/
+ftp_proxy http://www-cache.chiark.greenend.org.uk:3128/
+@@;@@#

diff --git a/files/emacs_ian.el b/files/emacs_ian.el
index 1871549da04977a4c75371f458bef8524084275a..86d0f0ac5d187848e17a385e3def77290b6da32d 100644 (file)
--- a/files/emacs_ian.el
+++ b/files/emacs_ian.el
@@ -4,6 +4,7 @@
 ; Un-disable narrow and eval-expression
 (put 'narrow-to-region 'disabled nil)
 (put 'eval-expression 'disabled nil)
+(standard-display-european t)
 ;
 ; Make sure we don't disturb links or change ownership, use numbers
 (setq backup-by-copying-when-mismatch t)
@@ -182,7 +183,7 @@
 ;
 ; Use auto-fill when editing text
 (add-hook 'text-mode-hook '(lambda () (auto-fill-mode 1)))
-(add-hook 'text-mode-hook '(lambda () (local-set-key " " 'self-insert-command)))
+; (add-hook 'text-mode-hook '(lambda () (local-set-key "       " 'self-insert-command)))
 ;
 ; Set up newline to auto-indent & other stuff for perl, c++ and c modes.
 (setq perl-mode-hook '(lambda () 
@@ -320,11 +321,12 @@ then call send-and-exit."
       vm-folder-directory "~/mail/"
       vm-delete-after-saving t
       vm-delete-empty-folders t
-      vm-mutable-windows nil
+      vm-mutable-windows t
       vm-auto-get-new-mail nil
       vm-auto-next-message nil
       vm-jump-to-new-messages nil
       vm-jump-to-unread-messages nil
+      vm-mime-digest-discard-header-regexp "only-drop-this-header"
       vm-preview-lines nil
       vm-included-text-prefix "> "
       vm-confirm-quit 1
@@ -341,7 +343,7 @@ then call send-and-exit."
       vm-frame-per-folder nil
       vm-tale-is-an-idiot t
       vm-primary-inbox (concat vm-folder-directory "INBOX")
-      vm-sysadmin-inbox (concat vm-folder-directory "SINBOX")
+      vm-sinbin-inbox (concat vm-folder-directory "SINBOX")
       vm-uninteresting-senders "ian"
       vm-reply-ignored-addresses
       (make-regexps-ignore-non-address
@@ -358,7 +360,20 @@ then call send-and-exit."
          "iwj10@cam.ac.uk" "Ian.Jackson@cl.cam.ac.uk"))
       mail-archive-file-name "~/mail/Outbound"
 
-@@?$ncipher?@@@@#
+@@?!$ncipher?@@
+      vm-spool-files
+      '((vm-primary-inbox "/var/spool/mail/@@$username@@"
+                         "~/mail/INBOX.CRASH")
+        (vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH")
+       (vm-sinbin-inbox "/var/spool/mail/ian" "~/mail/SINBOX.CRASH"))
+      vm-startup-with-summary t
+@@? $chiark && $username eq 'ian' ?@@
+
+@@:
       vm-spool-files (list
                       "~/mbox"
                       "~/mail/Outbound"
@@ -371,7 +386,7 @@ then call send-and-exit."
                       "~/News/r")
       mail-host-address "ncipher.com"
       user-mail-address "iwj@ncipher.com"
-@@;@@#
+@@;
 
 ;      vm-spool-files
 ;      (list
@@ -416,9 +431,13 @@ then call send-and-exit."
                    (setq mail-archive-file-name
                          "~/mail/SOutbound")))))
 ;
+;(defun vmi ()
+;  (interactive)
+;  (vm "/u/ijackson/mail/INBOX"))
+;;
 (defun vms ()
   (interactive)
-  (vm vm-sysadmin-inbox))
+  (vm vm-sinbin-inbox))
 ;
 (defun make-session ()
   "Makes this emacs hard to kill by requiring ^X^Cy to kill it

diff --git a/files/personal_scripts_bin_xloadt b/files/personal_scripts_bin_xloadt
index 53c8e3af47fd741c5d4ab53078b1a070f62ae434..073a19d095e0f75d028809a77bc67db261b308cd 100755 (executable)
--- a/files/personal_scripts_bin_xloadt
+++ b/files/personal_scripts_bin_xloadt
@@ -5,9 +5,12 @@ xlsclients | egrep \
  >/dev/null && exit 0
 xload -geometry 120x120+@@
 
-@hostlist= ($ncipher eq 'bos' ? qw(viking dover pell arrakis) :
-            $ncipher eq 'cam' ? qw(jura islay dover dounreay marple belgrano greenock) :
-            qw(davenant anarres lsd));
+@hostlist=
+($ncipher eq 'bos' ? qw(viking dover pell arrakis) :
+ $ncipher eq 'cam' ? qw(jura islay dover dounreay marple belgrano greenock) :
+ $chiark ? qw(chiark) :
+ qw(davenant anarres lsd));
+
 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";

diff --git a/gpt b/gpt
index 6bb3a4ea7ac11519531373ad72368d72d6f14b16..e4ce91db9573b2e3a67e2b7e24c118684f84e7b7 100755 (executable)
--- a/gpt
+++ b/gpt
@@ -19,8 +19,8 @@
 #   @@;     vA      <------------------------------------
 #           ||         then
 #   comment ||          ?@@
-#       @@# ||
-#           ||       included text fragment as
+#       @@# \/
+#           /\       included text fragment as
 #      else ||         string value    code to write out
 #       @@: ||          (@@             {@@
 #           ||      <------------------------------------

diff --git a/perms b/perms
index 330135346cd5809342f721b519148cfda940a20a..17c5658696cbdbdc62af80e3d091d17c965ddf7e 100644 (file)
--- a/perms
+++ b/perms
@@ -1,7 +1,6 @@
 .bash_history                          0400
 
 .configs/checkconfig                   +x
-.configs/chiarks                       +x
 .configs/configure                     +x
 .configs/rxprofile                     +x
 .configs/startemacs                    +x
@@ -10,6 +9,13 @@
 .configs/xclients                      +x
 .configs/xprofile                      +x
 .configs/xtools                                +x
+
+@@?$ncipher?@@
+.configs/chiarks                       +x
+@@:
+.configs/chiarks                       --
+@@;
+
 personal/scripts/bin/iwjendian         +x
 personal/scripts/bin/remoteshell       +x
 personal/scripts/bin/xloadt            +x
@@ -27,4 +33,5 @@ private/                              2770
 .ssh/authorized_keys                   644
 
 bitmap/root -> fischer
+
 .

diff --git a/process b/process
index 192d96461a78463c68941e1cf85fe0d1e2b07a72..33ed6aee27b59226ac89e63977e87f335b872125 100755 (executable)
--- a/process
+++ b/process
@@ -43,6 +43,8 @@ for (;;) {
     last if m/^\.$/;
     if (m/(.*\S)\s+\-\>\s+(\S.*)/) {
        $linktargs{$1}= $2;
+    } elsif (m/^(.*\S)\s+\-\-$/) {
+       $exclude{$1}= 1;
     } elsif (m/^(.*\S)\s+(\S+)$/) {
        ($of,$pe)=($1,$2);
        $isdir= $of =~ s,/$,,;
@@ -120,6 +122,8 @@ while ($if=readdir D) {
        length $1 eq 1 ? $1 : sprintf '%c', hex $1 
            /ge;
 
+    next if $exclude{$of};
+
     mkparents($of);
     $newf= 'new/'.$if;
     prep_proc('files/'.$if,$newf);

diff --git a/showresult b/showresult
index ed6e397514b994a72094a35d5226fa53417a82c1..4e8d86aac4b6b6d73e0b769c72fd01ab5ba5a275 100644 (file)
--- a/showresult
+++ b/showresult
@@ -2,3 +2,4 @@ platform @@$platform@@
 nodename @@$nodename@@
 hostname @@$hostname@@
 ncipher  @@$ncipher@@
+chiark   @@$chiark@@