3 files changed, 9 insertions, 8 deletions
diff --git a/abs/extra-testing/community/foldingathome/PKGBUILD b/abs/extra-testing/community/foldingathome/PKGBUILD
index 7f6cc20..ed35112 100644
--- a/abs/extra-testing/community/foldingathome/PKGBUILD
+++ b/abs/extra-testing/community/foldingathome/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=foldingathome
 pkgver=6.02
-pkgrel=3
+pkgrel=4
 pkgdesc="Folding@Home is a distributed computing project which studies protein folding, misfolding, aggregation, and related diseases."
 arch=('i686')
 url="http://folding.stanford.edu/"
@@ -15,7 +15,7 @@ install=foldingathome.install
 source=(http://www.stanford.edu/group/pandegroup/folding/release/FAH$pkgver-Linux.tgz
 	run)
 md5sums=('112b3d66909050f1bb990993a1464cb9'
-         '87a3a1cea8fbd420068461ed529d9f05')
+         '61eb4617e7363d586a05dde980ad1c14')
 
 build() {
   cd $startdir/src/
diff --git a/abs/extra-testing/community/foldingathome/foldingathome.install b/abs/extra-testing/community/foldingathome/foldingathome.install
index 3ecc7c9..8bcfaf3 100644
--- a/abs/extra-testing/community/foldingathome/foldingathome.install
+++ b/abs/extra-testing/community/foldingathome/foldingathome.install
@@ -1,20 +1,23 @@
 post_install() {
   # Check for an R5.5 fah installation.
   r5_fah_dir=/myth/folding@home
-  r6_fah_dir=/myth/folding_$(hostname)
+  r6_fah_dir=/myth/foldingathome/$(hostname)
   if [ -d "$r5_fah_dir" ] ; then
     if [ -d "$r6_fah_dir" ] ; then
       cat << 'EOM'
   --> You have an R5.5 and an R6 folding directory at the same time!
   --> you should manually delete the R5.5 directory:
   -->    $r5_fah_dir
+  --> The directroy used on R6 will be:
+  -->    $r6_fah_dir
 EOM
     else
+      mkdir -p /myth/foldingathome
       mv $r5_fah_dir $r6_fah_dir
     fi
   else
     if [ ! -d "$r6_fah_dir" ] ; then
-      mkdir $r6_fah_dir
+      mkdir -p $r6_fah_dir
       cat > $r6_fah_dir/client.cfg << 'EOM'
 [settings]
 username=LinHES
@@ -33,12 +36,10 @@ EOM
   fi
 
   /sbin/add_service.sh fah
-  sleep 5
-  /sbin/sv -v start fah
 }
 
 pre_remove() {
-  /sbin/sv stop fah
+  sv stop fah
   /sbin/remove_service.sh fah
 }
 
diff --git a/abs/extra-testing/community/foldingathome/run b/abs/extra-testing/community/foldingathome/run
index f8d536e..ede51f2 100644
--- a/abs/extra-testing/community/foldingathome/run
+++ b/abs/extra-testing/community/foldingathome/run
@@ -4,7 +4,7 @@ export TERM=linux
 . /etc/rc.d/functions
 stat_runit "Starting folding@home"
 
-FOLDING_DIR=/myth/folding_$(hostname)
+FOLDING_DIR=/myth/foldingathome/$(hostname)
 
 if [ -d $FOLDING_DIR ] ; then
   cd $FOLDING_DIR