--- /usr/portage/app-sci/setiathome/files/seti-init.d-r1	2003-04-17 15:50:58.000000000 -0700
+++ seti-init.d-r1	2003-04-17 17:55:33.000000000 -0700
@@ -1,33 +1,31 @@
 #!/sbin/runscript
 
-cpus=`egrep -c "^bogomips" /proc/cpuinfo`
+[ -z "${SETIATHOME_THREADS}" ] && SETIATHOME_THREADS=`egrep -c "^bogomips" /proc/cpuinfo`
 
 depend() { 
 	need net
 }
 
 checkconfig() {
-        if [ ! -e ${SETIATHOME_DIR} ]
+        if [ ! -e "${SETIATHOME_DIR}" ]
         then
                 einfo "Creating ${SETIATHOME_DIR}"
-                mkdir ${SETIATHOME_DIR}
+                mkdir "${SETIATHOME_DIR}"
         fi
 
-        if [ ! -e ${SETIATHOME_DIR}/user_info.sah ]
+        if [ ! -e "${SETIATHOME_DIR}/user_info.sah" ]
         then
                 einfo "Setting up SETI@home for the first time"
-                cd ${SETIATHOME_DIR}
-                ./setiathome -login
+                cd "${SETIATHOME_DIR}"
+                /opt/setiathome/setiathome -login
         fi
 
-        if [ $cpus != '1' ]; then
+        if [ "${SETIATHOME_THREADS}" != '1' ]; then
                 cd ${SETIATHOME_DIR}
-                for cpu in `seq 2 $cpus`; do
-                        if [ ! -e ${SETIATHOME_DIR}/cpu${cpu} ]; then
-                                mkdir ${SETIATHOME_DIR}/cpu${cpu}
-                                cp ${SETIATHOME_DIR}/* ${SETIATHOME_DIR}/cpu${cpu} > /dev/null
-                                rm ${SETIATHOME_DIR}/cpu${cpu}/*.sah > /dev/null
-                                cp ${SETIATHOME_DIR}/user_info.sah ${SETIATHOME_DIR}/cpu${cpu}
+                for thread in `seq 2 "${SETIATHOME_THREADS}"`; do
+                        if [ ! -e "${SETIATHOME_DIR}/thread${thread}" ]; then
+                                mkdir "${SETIATHOME_DIR}/thread${thread}"
+                                cp "${SETIATHOME_DIR}/user_info.sah" "${SETIATHOME_DIR}/thread${thread}"
                         fi
                 done
         fi
@@ -37,19 +35,19 @@
         checkconfig
 
 
-        if [ $cpus = '1' ]; then
+        if [ "${SETIATHOME_THREADS}" = '1' ]; then
                 ebegin "Starting SETI@home"
         else
-                ebegin "Starting SETI@home ($cpus processors)"
+                ebegin "Starting SETI@home (${SETIATHOME_THREADS} threads)"
         fi
 
-        for cpu in `seq 1 $cpus`; do
-                cd ${SETIATHOME_DIR}
-                if [ $cpu != '1' ]; then
-                        cd cpu${cpu}
+        for thread in `seq 1 "${SETIATHOME_THREADS}"`; do
+                cd "${SETIATHOME_DIR}"
+                if [ "${thread}" != '1' ]; then
+                        cd "thread${thread}"
                 fi
 
-                ./setiathome ${SETIATHOME_OPTIONS} >&/dev/null&
+                /opt/setiathome/setiathome ${SETIATHOME_OPTIONS} >&/dev/null&
         done
 
         eend $?