From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 17 Mar 2006 11:52:09 +0000 (+0000)
Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/c18a9b64e8143163311fd836b852f2ba49bbd636?ds=inline;hp=-c

Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
---

c18a9b64e8143163311fd836b852f2ba49bbd636
diff --combined setup
index 39456f6,a55fb16..5f0ce0e
--- a/setup
+++ b/setup
@@@ -7,7 -7,7 +7,7 @@@ umask 00
  sub=
  mkdir -p $HOME$sub
  
 -: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw}
 +: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw/profile}
  
  export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
  
@@@ -67,11 -67,7 +67,11 @@@ f
  ### Install necessary things
  echo "Installing useful scripts..."
  
 -for script in lesspipe.sh start-ssh-agent svnwrap; do
 +scripts="
 +  lesspipe.sh start-ssh-agent svnwrap"
 +[ "$xstuff" ] && scripts="$scripts
 +  xrun"
 +for script in $scripts; do
    $echon "  $script:$echoc"
    found=
    for p in /bin /usr/bin /usr/local/bin $(echo $PATH | tr : ' '); do
@@@ -142,7 -138,7 +142,7 @@@ f
  
  ### Symlink the various dotfiles into place
  dotfiles=" 
-   bash_profile bash_logout bashrc
+   bash_profile bash_logout bashrc inputrc
    emacs emacs-calc 
    vm mailrc
    lisp-init.lisp:.cmucl-init.lisp