[gentoo-commits] gentoo-x86 commit in sci-misc/boinc/files: boinc.init

["Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>]

scarabeus    09/11/22 13:38:27

  Modified:             boinc.init
  Log:
  Update script attach function to work correcty.
  (Portage version: 2.2_rc51/cvs/Linux x86_64)

Revision  Changes    Path
1.19                 sci-misc/boinc/files/boinc.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/boinc/files/boinc.init?r1=1.18&r2=1.19

Index: boinc.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/files/boinc.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- boinc.init	10 Nov 2009 21:42:49 -0000	1.18
+++ boinc.init	22 Nov 2009 13:38:27 -0000	1.19
@@ -56,22 +56,21 @@
 		ewarn "network is needed only for jobs fetching afterwards"
 	fi
 
-	generate_logs
-
 	if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then
 		ARGS="${ARGS} -allow_remote_gui_rpc"
 	fi
 
-	# sys-apps/util-linux
-	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
-
-	# check for baselayout version
 	if [ -n "${RC_UNAME}" ]; then
 		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}"
 	else
 		PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &"
 	fi
 
+	generate_logs
+
+	# sys-apps/util-linux
+	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+
 	eval ${CHRT} start-stop-daemon \
 		--quiet --start --chdir "${RUNTIMEDIR}" \
 		--pidfile "${PIDFILE}" \
@@ -95,26 +94,32 @@
 }
 
 attach() {
+	local password args url key
+	local was_started=true
+
 	printf "    Enter the Project URL: "
 	read url
 	printf "    Enter your Account Key: "
 	read key
 
-	RC_QUIET_STDOUT="yes" status
-	if [ $? = 1 ]; then
-		start
+	password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")
+	args="--project_attach ${url} ${key}"
+
+	if ! service_started; then
+		was_started=false
+		"${RC_SERVICE}" start
 	fi
+
 	ebegin "Attaching to project"
-		# we have to work in runtime directory
-		cd "${RUNTIMEDIR}"
-		# boinc does not return 1 when it fails currently
-		"${BOINCBIN}" --attach_project "${url}" "${key}" &> /dev/null
-		# change the perms for the files to defined user/group
-		chown -R ${USER}:${GROUP} *
+		boinccmd --host localhost --passwd ${password} ${args}
 	eend $?
 
+	unset password args url key
+
 	sleep 10
 	tail "${LOGFILE}"
+
+	[[ ${was_started} = "false" ]] && "${RC_SERVICE}" stop
 }
 
 stop() {