Browse files

merge

  • Loading branch information...
2 parents bded51b + 8597113 commit eae581a4edc238868471b0e4001875bfb2678861 @ai ai committed Dec 23, 2011
Showing with 21 additions and 9 deletions.
  1. +21 −9 install.sh
View
30 install.sh
@@ -34,10 +34,17 @@ fi
if [ $sudo = "yes" ]; then
sudo cp styles/* /usr/share/$gtksourceview/styles/
else
- if [ ! -d $HOME/.gnome2/gedit/styles ]; then
- mkdir -p ~/.gnome2/gedit/styles
+ if [ "$(echo $version3)" ]; then
+ if [ ! -d $HOME/.local/share/$gtksourceview/styles ]; then
+ mkdir -p ~/.local/share/$gtksourceview/styles
+ fi
+ cp styles/* ~/.local/share/$gtksourceview/styles
+ else
+ if [ ! -d $HOME/.gnome2/gedit/styles ]; then
+ mkdir -p ~/.gnome2/gedit/styles
+ fi
+ cp styles/* ~/.gnome2/gedit/styles
fi
- cp styles/* ~/.gnome2/gedit/styles
fi
# Register MIME-types
@@ -88,17 +95,17 @@ fi
if [ "$(echo $version3)" ]; then
if [ $sudo = "yes" ]; then
for plugin in plugins/gedit3/*; do
- sudo cp -R $plugin/* /usr/lib/gedit/plugins/
+ sudo cp -R $plugin /usr/lib/gedit/plugins/
done
else
- if [ ! -d $HOME/.gnome2/gedit/plugins ]; then
- mkdir -p ~/.gnome2/gedit/plugins
+ if [ ! -d $HOME/.local/share/gedit/plugins ]; then
+ mkdir -p ~/.local/share/gedit/plugins
fi
for plugin in plugins/gedit3/*; do
if [ $plugin = "plugins/gedit3/restoretabs" ]; then
echo "You need install gmate with sudo, to install Restore Tabs plugin"
else
- cp -R $plugin/* ~/.gnome2/gedit/plugins
+ cp -R $plugin ~/.local/share/gedit/plugins
fi
done
fi
@@ -123,15 +130,20 @@ if [ !"$(echo $version3)" ]; then
if [ $sudo = "yes" ]; then
sudo apt-get install python-webkit
else
- echo "Please install python-webkit (sudo apt-get install python-webkit)"
+ dpkg --list python-webkit > /dev/null 2>&1 || echo "Please install python-webkit (sudo apt-get install python-webkit)"
fi
fi
# Execute debian postins script
if [ $sudo = "yes" ]; then
`sudo sh ./debian/postinst`
else
- `sh ./debian/postinst`
+ # Fix for the RestoreTabs plugin
+ if [ ! -d $HOME~/.local/share/glib-2.0/schemas/ ]; then
+ mkdir -p ~/.local/share/glib-2.0/schemas/
+ fi
+ mv ~/.local/share/gedit/plugins/restoretabs/org.gnome.gedit.plugins.restoretabs.gschema.xml ~/.local/share/glib-2.0/schemas/
+ glib-compile-schemas ~/.local/share/glib-2.0/schemas/
fi
echo -n "Do you want to activate default plugin and configuration set? [y,N]:"

0 comments on commit eae581a

Please sign in to comment.