[SM-Commit] PERFORCE change 76927 by Eric Sandall for review

Perforce Review Daemon p4review at smee.org
Tue Mar 28 13:20:02 EST 2006


Change 76927 by eric_sandall at sandalle-moby on 2006/03/28 19:15:48

	   * DETAILS: Added PATCHLEVEL so people get the boinc init script (if they
	     haven't already) and so people with the current init script get the fixed
	     version (also so wxgtk-no-unicode gets marked as optional ;)).
	   * DEPENDS: Made wxgtk-no-unicode optional (again...)
	     Added missing '&&' after first if/fi
	   * init.d/boinc: Fixed missing quote
	     BOINC_PRAMS -> BOINC_PARMS
	     Removed unecessary '-r' in rm for PIDFILE
	     Removed quotes around the `su - boinc -c ...` command

Affected files ...

... //sgl/grimoires/test/science/boinc/DEPENDS#6 integrate
... //sgl/grimoires/test/science/boinc/HISTORY#9 integrate
... //sgl/grimoires/test/science/boinc/init.d/boinc#3 integrate

Differences ...

==== //sgl/grimoires/test/science/boinc/DEPENDS#6 (xtext) ====

@@ -2,10 +2,15 @@
 depends  automake  &&
 depends  g++       &&
 depends  curl      &&
+
 if [[ $BOINC_PARTS == both || $BOINC_PARTS == client ]]
 then
-  depends  wxgtk-no-unicode '--with-wx-config=wx-config'
-fi
+  optional_depends  wxgtk-no-unicode              \
+                    '--with-wx-config=wx-config'  \
+                    ''                            \
+                    'for wxGTK-based GUI'
+fi  &&
+
 if [[ $BOINC_PARTS == both || $BOINC_PARTS == server ]]
 then
   depends  mysql 'MYSQL_CONFIG=mysql_config'

==== //sgl/grimoires/test/science/boinc/HISTORY#9 (text) ====

@@ -1,3 +1,14 @@
+2006-03-28 Eric Sandall <eric at sandall.us>
+	* DETAILS: Added PATCHLEVEL so people get the boinc init script (if they
+	  haven't already) and so people with the current init script get the fixed
+	  version (also so wxgtk-no-unicode gets marked as optional ;)).
+	* DEPENDS: Made wxgtk-no-unicode optional (again...)
+	  Added missing '&&' after first if/fi
+	* init.d/boinc: Fixed missing quote
+	  BOINC_PRAMS -> BOINC_PARMS
+	  Removed unecessary '-r' in rm for PIDFILE
+	  Removed quotes around the `su - boinc -c ...` command
+
 2006-03-26 David Brown <dmlb2000 at gmail.com>
 	* PRE_BUILD: added patch for loss of presision when type casting a void
 	  pointer to an int
@@ -19,9 +30,9 @@
 	* FINAL: fixed ending &&
 
 2006-03-25 Robin Cook <rcook at wyrms.net>
-        * BUILD: added create_account
-        * init.d: added to start on boot up
-        * FINAL: added for message
+	* BUILD: added create_account
+	* init.d: added to start on boot up
+	* FINAL: added for message
 
 2006-03-25 Eric Sandall <eric at sandall.us>
 	* DEPENDS: Make wxgtk-no-unicode dependency optional

==== //sgl/grimoires/test/science/boinc/init.d/boinc#3 (xtext) ====

@@ -29,17 +29,17 @@
       chown boinc:boinc ${BOINC_HOME}
       echo "Starting $NAME..."
       cd ${BOINC_HOME}
-      su - ${BOINC_USER} -c "cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS} -attach_project ${BOINC_URL} ${BOINC_KEY} ${BOINC_PRAMS} >> ${BOINC_LOG} 2>>${$BOINC_ERROR} &
+      su - ${BOINC_USER} -c cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS} -attach_project ${BOINC_URL} ${BOINC_KEY} ${BOINC_PARMS} >> ${BOINC_LOG} 2>>${$BOINC_ERROR} &
    else
       echo "Starting $NAME..."
       cd ${BOINC_HOME}
-      su - ${BOINC_USER} -c "cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS} ${BOINC_PRAMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR}" &
+      su - ${BOINC_USER} -c cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS} ${BOINC_PARMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR} &
    fi
 }
 
 function stop() {
    echo "Stopping $NAME..."
    killall -HUP ${PROGRAM}
-   rm -rf ${PIDFILE}
+   rm -f ${PIDFILE}
 }
 



More information about the SM-Commit mailing list