Merge branch 'master' of ustrat:git/staging/profile

[profile] / setup

diff --git a/setup b/setup
index 09e3005..d1393df 100755 (executable)
--- a/setup
+++ b/setup
@@ -133,7 +133,7 @@ fi
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile
+  vimrc mg zile lesskey
   ditz-config
   mailrc signature
   cgrc tigrc
@@ -141,7 +141,6 @@ dotfiles="
   guile
   rcrc
   toprc
-  kermrc
   mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
   aspell.conf
   tclshrc:.tclshrc tclshrc:.wishrc
@@ -150,9 +149,10 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap Xdefaults vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -179,6 +179,7 @@ echo "      all done."
 ## Substitute things which need substituting.
 dotfilessubst="
   gitconfig
+  mykermrc
   pulse-default.pa.in:.pulse/default.pa"
 echo "Installing dotfiles with substitutions..."
 for d in $dotfilessubst; do
@@ -195,7 +196,7 @@ for d in $dotfilessubst; do
 
 /@home@/ s\a\a$HOME\ag
 /@profile@/ s\a\a$here\ag
-/@releasekey@/ s\a\a$(bin/mdw-conf release-key 481334C2)\ag
+/@releasekey@/ s\a\a$(bin/mdw-conf releasekey 481334C2)\ag
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"