moved wmaker_data and e16_themes settings to /usr/share/wm_data.

This was done incase /data  moves to it's own partition

2 files changed, 11 insertions, 11 deletions

diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD
index 863d257..9f4f850 100644
--- a/abs/core/e16_theme_settings/PKGBUILD
+++ b/abs/core/e16_theme_settings/PKGBUILD
@@ -1,19 +1,18 @@
 pkgname=e16_theme_settings
 pkgver=1.0
-pkgrel=13
+pkgrel=14
 pkgdesc="Default settings for e16"
 depends=(enlightenment 'linhes-scripts>=7-24')
 source=()
 arch=('i686' 'x86_64')
 groups=(alt_wm)
 install=e16.install
-configdir=/data/
-backup=('data/e16_config_dir/e_config--0.0.cfg')
+configdir=/usr/share/wm_data
+backup=('usr/share/wm_data/e16_config_dir/e_config--0.0.cfg')
 build() {
 	echo $startdir
 	mkdir -p $pkgdir/$configdir
         rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir
-#        chown -R mythtv:mythtv $startdir/$configdir
   	echo "all done"
 }
 
diff --git a/abs/core/e16_theme_settings/e16.install b/abs/core/e16_theme_settings/e16.install
index 9840e93..0cb1cb9 100644
--- a/abs/core/e16_theme_settings/e16.install
+++ b/abs/core/e16_theme_settings/e16.install
@@ -1,5 +1,6 @@
 # This is a default template for a post-install scriptlet.  You can
 # remove any functions you don't need (and this header).
+configdir=/usr/share/wm_data/
 
 # arg 1:  the new package version
 pre_install() {
@@ -9,11 +10,11 @@ pre_install() {
 
 # arg 1:  the new package version
 post_install() {
-   chown -R 1000:100 /data/e16_config_dir
-   setfacl -d -R -m u:1000:rwx /data/e16_config_dir
-   setfacl -R -m u:1000:rwx /data/e16_config_dir
-   setfacl -d -R -m o::rwx /data/e16_config_dir
-   setfacl  -R -m o::rwx /data/e16_config_dir
+   chown -R 1000:100 $configdir/e16_config_dir
+   setfacl -d -R -m u:1000:rwx $configdir/e16_config_dir
+   setfacl -R -m u:1000:rwx $configdir/e16_config_dir
+   setfacl -d -R -m o::rwx $configdir/e16_config_dir
+   setfacl  -R -m o::rwx $configdir/e16_config_dir
 
 }
 
@@ -26,9 +27,9 @@ pre_upgrade() {
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-   if [ -e /data/e16_config_dir/cached ]
+   if [ -e $configdir/e16_config_dir/cached ]
    then
-	   rm -rf /data/e16_config_dir/cached/*
+	   rm -rf $configdir/e16_config_dir/cached/*
    fi
    post_install
 }