fix conflic

This commit is contained in:
Mathieu Maret 2009-11-06 10:55:34 +01:00
commit e84b75af42

16
Desktop
View File

@ -1,6 +1,6 @@
NOWHERE=$PWD NOWHERE=$PWD
aptitude install openbox aptitude install openbox obconf obmenu
aptitude install libcairo2-dev libpango1.0-dev libglib2.0-dev libimlib2-dev libxinerama-dev #libxrand-dev aptitude install libcairo2-dev libpango1.0-dev libglib2.0-dev libimlib2-dev libxinerama-dev #libxrand-dev
if [ ! -f ./tint2-read-only ]; then if [ ! -f ./tint2-read-only ]; then
@ -8,25 +8,27 @@ if [ ! -f ./tint2-read-only ]; then
fi fi
cd tint2-read-only cd tint2-read-only
./autogen.sh
./configure ./configure
make make
make install make install
mkdir $HOME/.config/tint2/tint2rc
cp $NOWHERE/tintrc $HOME/.config/tint2/tint2rc ln -s $NOWHERE/tint2rc $HOME/.config/tint2/tint2rc
#CONKY #CONKY
aptitude install conky aptitude install conky
cp $NOWHERE/conkyrc $HOME/.conkyrc ln -s $NOWHERE/conkyrc $HOME/.conkyrc
#GMRUN #GMRUN
aptitude install gmrun aptitude install gmrun
cp $NOWHERE/gmrunrc $HOME/.gmrunrc ln -s $NOWHERE/gmrunrc $HOME/.gmrunrc
#Config openbox #Config openbox
#install GSM-openboxTheme.obt dans openbox #install GSM-openboxTheme.obt dans openbox
cp $NOWHERE/OpenBox-rx.xml $HOME/.config/openbox/rc.xml
cp $NOWHERE/autostart.sh $HOME/.config/openbox/autostart.sh
mkdir ~/.config/openbox
ln -s $NOWHERE/OpenBox-rc.xml $HOME/.config/openbox/rc.xml
ln -s $NOWHERE/autostart.sh $HOME/.config/openbox/autostart.sh
aptitude install network-manager-gnome aptitude install network-manager-gnome