Fix bug 71700 hopefully. Use bash not python for copy_client_config. Update the init script to do more sane things and not fail to stop on multi-cpu systems.

(Portage version: 2.0.51-r15)

3 files changed, 60 insertions, 0 deletions

diff --git a/sci-biology/foldingathome/files/copy_client_config-5.0.2-r1 b/sci-biology/foldingathome/files/copy_client_config-5.0.2-r1
new file mode 100644
index 000000000000..3d60b8a32cef
--- /dev/null
+++ b/sci-biology/foldingathome/files/copy_client_config-5.0.2-r1
@@ -0,0 +1,14 @@
+#!/bin/bash
+C="client"
+C1_CFG="${C}1/${C}.cfg"
+cd /opt/foldingathome/
+if [ ! -f ${C1_CFG} ]; then
+	echo "Client not yet configured, exiting"
+	exit 1;
+fi
+sed -i -e 's/^\(team=\)0/\111298/' ${C1_CFG}
+declare -i id=$(sed -e 's/^machineid=\([0-9]*\).*$/\1/p;d' ${C1_CFG})
+for (( i=2; ${i}<=8; i=${i}+1 )); do
+	id=$id+1
+	sed -e "s/^\(machineid=\)[0-9]*/\1${id}/" ${C1_CFG} > ${C}${i}/${C}.cfg
+done
diff --git a/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r1 b/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r1
new file mode 100644
index 000000000000..44de62a3f7fd
--- /dev/null
+++ b/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r1
@@ -0,0 +1 @@
+MD5 4855e808fb94e6d2c5fde345aea0cdc3 FAH502-Linux.exe 249236
diff --git a/sci-biology/foldingathome/files/init-5.0.2-r1 b/sci-biology/foldingathome/files/init-5.0.2-r1
new file mode 100644
index 000000000000..ef2f816bf691
--- /dev/null
+++ b/sci-biology/foldingathome/files/init-5.0.2-r1
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/init-5.0.2-r1,v 1.1 2005/02/03 17:14:46 lostlogic Exp $
+
+do_config() {
+	if [ -z "${CPU}" ] || [ "${CPU}" == "0" ]; then
+		if [ -r /proc/cpuinfo ]; then
+			CPU=`grep processor </proc/cpuinfo | wc -l`
+		else
+			CPU=1
+		fi
+	fi
+}
+
+start() {
+	do_config
+	su foldingathome -c /opt/foldingathome/copy_client_config
+	for (($CPU; CPU > 0; CPU--)); do
+		ebegin "Starting Folding@Home on CPU ${CPU}"
+		cd /opt/foldingathome/client${CPU}/
+		nice -n 20 su foldingathome -c "/opt/foldingathome/client${CPU}/foldingathome ${FOLD_OPTS}" &>/dev/null &
+		eend $?
+	done
+}
+
+stop() {
+	do_config
+	for (($CPU; CPU > 0; CPU--)); do
+		ebegin "Stopping Folding@Home on CPU ${CPU}"
+		cd /opt/foldingathome/client${CPU}/
+                for I in FahCore*.exe; do
+                        if ps ax|grep $I > /dev/null 2>&1; then
+				killall -q $I > /dev/null 2>&1
+			fi
+                done
+		sleep 1
+		if ps ax|grep '[/]opt[/]foldingathome/client${CPU}/' > /dev/null 2>&1; then
+			eend 1
+		else
+			eend 0
+		fi
+        done
+}
+