foldingathome: change location to /myth/foldingathome/

1 files changed, 6 insertions, 5 deletions

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
 }