summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar ryuslash2010-10-05 11:37:43 +0200
committerGravatar ryuslash2010-10-05 11:37:43 +0200
commit5f71b5a2c6c792aba79ef8c747f3ec3343c4929c (patch)
tree6b8a7c85b9f25bfcb08958b935db9809b844cdba
parente7c78a78d9b8bdc9f918af8862c53a9a08a2c007 (diff)
downloaddotfiles-5f71b5a2c6c792aba79ef8c747f3ec3343c4929c.tar.gz
dotfiles-5f71b5a2c6c792aba79ef8c747f3ec3343c4929c.zip
install changed
-rwxr-xr-xinstall.sh35
1 files changed, 22 insertions, 13 deletions
diff --git a/install.sh b/install.sh
index b7da86b..45d625f 100755
--- a/install.sh
+++ b/install.sh
@@ -2,18 +2,18 @@ INSTALL_BASEFILE=`readlink -f $0`
INSTALL_BASEDIR=`dirname $INSTALL_BASEFILE`
# EMACS
-echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
-ln -sf $INSTALL_BASEDIR/.emacs $HOME/.emacs
-if [ -d $HOME/.emacs.d ]; then
- if [ -d $HOME/.emacs.d_backup ]; then
- echo "Removing old $HOME/.emacs.d_backup"
- rm -rf $HOME/.emacs.d_backup
- fi
- echo "Moving old $HOME/.emacs.d"
- mv $HOME/.emacs.d $HOME/.emacs.d_backup
-fi
-echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
-ln -sf $INSTALL_BASEDIR/.emacs.d $HOME/.emacs.d
+#echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
+#ln -sf $INSTALL_BASEDIR/.emacs $HOME/.emacs
+#if [ -d $HOME/.emacs.d ]; then
+# if [ -d $HOME/.emacs.d_backup ]; then
+# echo "Removing old $HOME/.emacs.d_backup"
+# rm -rf $HOME/.emacs.d_backup
+# fi
+# echo "Moving old $HOME/.emacs.d"
+# mv $HOME/.emacs.d $HOME/.emacs.d_backup
+#fi
+#echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
+#ln -sf $INSTALL_BASEDIR/.emacs.d $HOME/.emacs.d
# XDEFAULTS
echo "Linking $INSTALL_BASEDIR/.Xdefaults to $HOME/.Xdefaults"
@@ -27,6 +27,7 @@ ln -sf $INSTALL_BASEDIR/.Xmodmap $HOME/.Xmodmap
echo "Linking $INSTALL_BASEDIR/.conkerorrc to $HOME/.conkerorrc"
ln -sf $INSTALL_BASEDIR/.conkerorrc $HOME/.conkerorrc
+# awesome
echo "Linking #INSTALL_BASEDIR/awesome to $HOME/.config/awesome"
if [ -d $HOME/.config/awesome ]; then
if [ -d $HOME/.config/awesome_backup ]; then
@@ -37,4 +38,12 @@ if [ -d $HOME/.config/awesome ]; then
mv $HOME/.config/awesome $HOME/.config/awesome_backup
fi
echo "Linking $INSTALL_BASEDIR/awesome to $HOME/.config/awesome"
-ln -sf $INSTALL_BASEDIR/awesome $HOME/.config/awesome \ No newline at end of file
+ln -sf $INSTALL_BASEDIR/awesome $HOME/.config/awesome
+
+for item in `ls`; do
+ if [ -d $item ]; then
+ if [ -e $item/install.sh ]; then
+ . $item/install.sh $INSTALL_BASEDIR
+ fi
+ fi
+done