Bugfixes.

diff --git a/execute b/execute
index 9e166141712a6b8a742083a994fe54818b3236a7..d2aa2b2477b070d6561efa3ab5ff4ae62d09785f 100755 (executable)
--- a/execute
+++ b/execute
@@ -1,4 +1,10 @@
 #!/bin/sh
-set -x
-make -C autotitle
-make -C autotitle install INSTALLDIR=$HOME/personal/@@$platform@@/bin
+set -ex
+
+for f in       autotitle misc
+do
+       cd $f
+       make
+       make install INSTALLDIR=$HOME/personal/@@$platform@@/bin
+       cd ..
+done

diff --git a/files/_.configs_chiarks b/files/_.configs_chiarks
index 23ef68f4564328b23ace58302adea0db3057e008..55fc59e56ffa33d6c83c3237e96d5dab2361558a 100755 (executable)
--- a/files/_.configs_chiarks
+++ b/files/_.configs_chiarks
@@ -14,12 +14,12 @@ esac
 for x in 3 2 1
 do
        sz=80x55
-       y=$[35*$x+100+$pixels_y]
+       y=$(( 35*$x+100+$pixels_y ))
        xb=$(( (($pixels_x-503)*(3-$x))/2 ))
        xterm-CT "chiark ssh #$x" -geometry $sz+$xb+$y \
                -e ssh chiark.greenend.org.uk -l ijackson &
        echo -n :
-       xterm-CT "chiark ssh ian #$x" -geometry $sz+$(( $pixels_x+$xb ))+$y \
+       xterm-CT "chiark ssh ian #$x" -geometry $sz+$(( $pixels_x + $xb ))+$y \
                -e ssh chiark.greenend.org.uk -l ian &
        echo -n :
 done

diff --git a/files/_.configs_startemacs b/files/_.configs_startemacs
index 3f5a80e9dcb7af92117bcd5503036a21a3643826..8a304e4f84618b841a5198bb16fce876bef66747 100755 (executable)
--- a/files/_.configs_startemacs
+++ b/files/_.configs_startemacs
@@ -5,7 +5,7 @@ echo -n '#'
 cd
 eval `cd $HOME && .configs/configure`
 
-emacs -f make-session -geometry 80x60+$(( $pixels_x*3-486 ))+0 &
+emacs -f make-session -geometry 80x60+$(( $pixels_x * 3 - 486 ))+0 &
 
 # if [ "x$chost" = x ]
 # then

diff --git a/files/_.configs_xmodmap-kb=pc b/files/_.configs_xmodmap-kb=pc
index d6eae9f5d04bdbca9ee3392ac8430fa4047b11b9..38de9fbe42dd01a5945a1ee9fe78dff386e194e3 100644 (file)
--- a/files/_.configs_xmodmap-kb=pc
+++ b/files/_.configs_xmodmap-kb=pc
@@ -14,3 +14,5 @@ keycode 37 = Caps_Lock
 keycode 66 = Control_L
 add Lock = Caps_Lock
 add Control = Control_L
+
+clear mod4

diff --git a/files/_.ircrc b/files/_.ircrc
index eefaac2f64b842ff809931ea4cc5f590e6ab2deb..9b7e7b252c379a5dd299be8fec1bb05ac471dfc3 100644 (file)
--- a/files/_.ircrc
+++ b/files/_.ircrc
@@ -15,6 +15,6 @@
   join #chiark
 }
 /load private/ircpass
-/alias fastness-id
+/alias fastness-id {
   exec -msg Fastness -name fastness-id-proc irc-fastness-id
 }

diff --git a/files/_.vtwmrc b/files/_.vtwmrc
index ad719fbd79b74f5dac693b585d47dc62f4a371e1..0de46279ba0a356a8269c5ae43477707e48405da 100644 (file)
--- a/files/_.vtwmrc
+++ b/files/_.vtwmrc
@@ -263,7 +263,8 @@ menu "programs"
        "Emacs restart" !".configs/startemacs"
        "Emacs left"    !"emacs -geometry 79x40+0+35 &"
        ""              f.nop
-       "IRC chiark" !"xterm -geometry 80x80+240+95 -e irc Diziet localhost &"
+ "IRC Diziet" !"xterm -geometry 80x70+240-0 -T 'IRC Diziet' -e irc Diziet localhost &"
+ "IRC iwj" !"xterm -geometry 80x70+340-0 -T 'IRC iwj' -e irc iwj cam.irc.devel.ncipher.com &"
        ""              f.nop
        "Trn"           !"xterm -geometry 80x45+240+95 -e trn &"
        "Archie"        !"xarchie &"

diff --git a/files/personal_scripts_bin_xterm-CT b/files/personal_scripts_bin_xterm-CT
index 1f2c4116b39a443e2a620eedfc51d2f039f90a42..15e8d7cbcf6f2476bfe4c425b99faf28b7affbde 100755 (executable)
--- a/files/personal_scripts_bin_xterm-CT
+++ b/files/personal_scripts_bin_xterm-CT
@@ -3,7 +3,7 @@ set -e
 titlebase="$1"
 shift
 touch "$HOME/.counters/l.$DISPLAY"
-newcount=`with-lock-wait "$HOME/.counters/l.$DISPLAY" perl -e '
+newcount=`with-lock-ex -w "$HOME/.counters/l.$DISPLAY" perl -e '
        chdir($ARGV[2]) or die $!;
        $tb= unpack("H*",$ARGV[1]); $found=0;
        open(X,"v.$ARGV[0]\0") or die $!;

diff --git a/misc/.cvsignore b/misc/.cvsignore
new file mode 100644 (file)
index 0000000..076608b
--- /dev/null
+++ b/misc/.cvsignore
@@ -0,0 +1 @@
+with-lock-ex

diff --git a/misc/Makefile b/misc/Makefile
new file mode 100644 (file)
index 0000000..f24f08e
--- /dev/null
+++ b/misc/Makefile
@@ -0,0 +1,16 @@
+INSTALLDIR=    $(HOME)/bin
+
+TARGETS=       with-lock-ex
+
+CPPFLAGS=      $(OPTIONS)
+CFLAGS=                $(OPTIMISE)
+OPTIMISE=      -O2
+OPTIONS=
+
+default:       $(TARGETS)
+
+install:
+               set -e; for f in $(TARGETS); do \
+                       rm -f $(INSTALLDIR)/$$f; \
+                       ln $$f $(INSTALLDIR)/$$f; \
+               done

diff --git a/perms b/perms
index d6e4f13c618a89f2368b641e969cc3e5d5d58f13..66f7fab5095b65764ee42ff9ffbabb544e5e4a6e 100644 (file)
--- a/perms
+++ b/perms
@@ -11,6 +11,7 @@
 .configs/xtools                                +x
 personal/scripts/bin/remoteshell       +x
 personal/scripts/bin/xloadt            +x
+personal/scripts/bin/xterm-CT          +x
 
 personal/@@$platform@@/bin/            /
 junk/                                  /
@@ -19,5 +20,5 @@ junk/                                 /
 .counters/                             2770
 private/                               2770
 
-bitmap/root -> bitmap/fischer
+bitmap/root -> fischer
 .

diff --git a/process b/process
index 513091890610b533e03631bee6c7198d31da57a1..0787d7986f99846f3188219d83d52a43c202a669 100755 (executable)
--- a/process
+++ b/process
@@ -158,11 +158,12 @@ foreach $link (keys %linktargs) {
        defined($rl= readlink $home.$link) or die $!;
     } else {
        die unless $!==&ENOENT;
-       $rl= '';
+       $rl= undef;
     }
     if ($rl ne $targ) {
        would($link, "symlink $targ <-");
        if ($action) {
+           unlink $home.$link if defined $rl;
            symlink $targ,$home.$link or die $!;
        }
     }