~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ustrat:git/staging/profile
[profile]
/
setup
diff --git
a/setup
b/setup
index
b5fb47d
..
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
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
ditz-config
mailrc signature
cgrc tigrc
@@
-149,9
+149,10
@@
dotfiles="
lisp-init.lisp:.clisprc.lisp
lisp-init.lisp:.eclrc
swank.lisp
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
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
fonts.conf
stalonetrayrc
putty-defaults:.putty/sessions/Default%20Settings
@@
-178,6
+179,7
@@
echo " all done."
## Substitute things which need substituting.
dotfilessubst="
gitconfig
## 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
pulse-default.pa.in:.pulse/default.pa"
echo "Installing dotfiles with substitutions..."
for d in $dotfilessubst; do
@@
-194,7
+196,7
@@
for d in $dotfilessubst; do
/@home@/ s
\a
\a
$HOME
\a
g
/@profile@/ s
\a
\a
$here
\a
g
/@home@/ s
\a
\a
$HOME
\a
g
/@profile@/ s
\a
\a
$here
\a
g
-/@releasekey@/ s
\a
\a
$(bin/mdw-conf release
-
key 481334C2)
\a
g
+/@releasekey@/ s
\a
\a
$(bin/mdw-conf releasekey 481334C2)
\a
g
" dot/$d >$ft.new
mv $ft.new $ft
echo " $target"
" dot/$d >$ft.new
mv $ft.new $ft
echo " $target"
@@
-241,6
+243,7
@@
scripts="
lesspipe.sh
start-ssh-agent
svnwrap
lesspipe.sh
start-ssh-agent
svnwrap
+ guest-console
hyperspec"
[ "$xstuff" ] && scripts="$scripts
xinitcmd
hyperspec"
[ "$xstuff" ] && scripts="$scripts
xinitcmd
@@
-328,7
+331,7
@@
for f in dot-emacs.el Makefile; do
mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f
done
$echon " compiling$echoc"
mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f
done
$echon " compiling$echoc"
-make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs
+{ cd $HOME$sub/lib/emacs && make EMACS=$emacs; } >/dev/null 2>&1
echo " done."
###----- That's all, folks --------------------------------------------------
echo " done."
###----- That's all, folks --------------------------------------------------