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