Fix init.d file (-R for recursive chown), quote some variables, specify which files...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index b696c6565482445499b3b5a0aeeaaf28f6af9bca..fdbea301f953679b5e478bdb5f0083052804abd0 100644 (file)
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -3,13 +3,13 @@ AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c
 AUX quasselcore-2.conf 756 RMD160 5f7ec7d1e46da202fdc18e2bd25827d307ec15fc SHA1 688039bd9616177eab803b7a4b12945e009cc806 SHA256 48079bebba2e723d582751b63b5d696ba506b364d20268c38f565f2c85257baa
 AUX quasselcore-2.init 1693 RMD160 729dad48f3cb5afd35bb76c731349109becee392 SHA1 f1a83d63398b3df5e7700921db22d76595a3a96c SHA256 5632cfbb1921561924af1d50196e0e9d1bb80caa90f5d98e551af7c30174458a
 AUX quasselcore.conf 496 RMD160 328fa5c018107a34e67a681da79f87c42c16bca5 SHA1 2a4cf7f8b1798fadbd6b42273d3b9a32470bb8a9 SHA256 120a7664ce3819164beeae973c2c950b462844b80fe38240b3de48514797cbf2
-AUX quasselcore.init 1755 RMD160 755e6640cfd10d938ff9320ff576ab5a783725e5 SHA1 28530ff76eda66a6e0dcce509f0aa70517b1468a SHA256 0db3db469a90840ef2136210d8623b95d8ab02942efba2789030b31cd82a0bc8
+AUX quasselcore.init 1802 RMD160 c170596dd415d32d3147b6cf1a263a48f4b12268 SHA1 87a62fa64d16edaa6d8435490259b0e452b2a80f SHA256 4f79a3cc0b8842309c3f65d154dba1a434f33a36cc140bac10387ad1f16b5ad6
 DIST quassel-0.5.1.tar.bz2 3339773 RMD160 411f70ed4b4162f8523bf5498cd22aca43171b5c SHA1 448c2712176d5c0328b439b60ee27e06645339ba SHA256 c2aa0694b775b33380cb5bb452512433fa9f0bf4820778e8ec98f621e5458f62
 DIST quassel-0.5.2.tar.bz2 3307109 RMD160 bac05710c6126150c1546713325f319bef2640c8 SHA1 68abd45cd506303090b54e4aa21eb0273d3e4217 SHA256 9c98dcefa4b1655ae92b0204ef30594c9043701fb66350c5e69beafa86b88c8a
 DIST quassel-0.6.1.tar.bz2 2531035 RMD160 39e08319488062e02545055c91554ee1ea025912 SHA1 92017692712ed54d678211bb8d4dc4a992601d2d SHA256 e01b5a91359ca37b3db2849b3b1db32f768c865f698d0a4f3ef679f722edb5ec
 EBUILD quassel-0.5.1.ebuild 3218 RMD160 39c25156b7ed5c938be60b9b189d7c52a18af088 SHA1 5b9b23f3c6a99ce9494ba4c6d0ceef131c0d7d2a SHA256 d7e361d29f8ab6caf2303600e1832caab14165eda7201557ec3cc0a2e3055cdf
 EBUILD quassel-0.5.2.ebuild 3282 RMD160 2c191d65f757c83445da768cd83966c912682bc6 SHA1 00129b070abdd35dfafc8e12bcd286897b29697f SHA256 e7c9433470ad9a1a0e2b2d74f2e90dc15008fc86a484cf066ceb38f185832fba
 EBUILD quassel-0.6.1.ebuild 2901 RMD160 bffc3302e8829a4e4d3ffbe3d449f95b06cbd6d7 SHA1 7c5f1c1bb8c0bf5d1d9b2da962f1319e3ff44ec7 SHA256 ce206222ccec46dfdd8602d87a1cdfc71db626d2546863f9b2de95590013ebcd
-EBUILD quassel-9999.ebuild 3982 RMD160 5c450f79de3e1b5583e05748c790af603293ecad SHA1 211e2fd6a9a289f54f81615a087b1a0a0ca09803 SHA256 fbca5674fb44f010b040d1654d9396d8553e42ac2978f290ac68bd4e28347e5f
+EBUILD quassel-9999.ebuild 4064 RMD160 4a3e7e3ce9fc0fcfdb03e03af58b6389130f3904 SHA1 29abe449d78a51db4ce9989f5f2257df1f0ef58f SHA256 1dcaaa829aab8241dff9287eb73eaef0a0e51ded93014cb071b41194714ba3e4
 MISC ChangeLog 16229 RMD160 994ef1c8a217bcb1835ba6b202faebe62881b8ac SHA1 c7103d15ccd3ae4a6a8dadd83ce5d628c878cb1b SHA256 359f4ba53d15c862024508f61dd6a9ed1b536e97af732a6b716432797bcc85d4
 MISC metadata.xml 1903 RMD160 cc0c6f3ca1ade233d4640dfd913e83ee13cdbdc2 SHA1 ae3def4a7ce3f9bfc42e79d3ea851c65e0c00c21 SHA256 6188126527fca9af504832fb9a492111c35b78fa9ed422ae0fcf2bcb6478cd95

diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
index 8dacba7c7356df991da47ab2ebdf9964e091100d..57d79ccf96c18e2b0804bede519c3933db169ab2 100644 (file)
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.5 2010/07/01 10:34:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.6 2010/07/03 10:30:55 reavertm Exp $
 
 depend() {
        need net
@@ -11,23 +11,28 @@ depend() {
 LOGFILE="/var/log/quassel.log"
 CORE="$(which quasselcore)"
 PID="/var/run/quassel.pid"
-CONFIGDIR="/var/lib/quassel/"
+CONFIGDIR="/var/lib/quassel"
 QUASSEL_USER="quassel"
 
 checkconfig() {
+       # set defaults
+       LISTEN=${LISTEN:-"0.0.0.0"}
+       LOGLEVEL=${LOGLEVEL:-"Info"}
+       PORT=${PORT:-"4242"}
+
        # check config folder
        if [ ! -d "${CONFIGDIR}" ]; then
-               mkdir ${CONFIGDIR} || return 1
+               mkdir "${CONFIGDIR}" || return 1
        fi
        # permissions always changed just to avoid runtime issues
-       chown -r ${QUASSEL_USER}:${QUASSEL_USER} ${CONFIGDIR} || return 1
+       chown -R "${QUASSEL_USER}":"${QUASSEL_USER}" "${CONFIGDIR}" || return 1
 
        # check log file
        if [ ! -e "${LOGFILE}" ]; then
-               touch ${LOGFILE} || return 1
+               touch "${LOGFILE}" || return 1
        fi
        # permissions always changed just to avoid runtime issues
-       chown ${QUASSEL_USER}:${QUASSEL_USER} ${LOGFILE} || return 1
+       chown "${QUASSEL_USER}":"${QUASSEL_USER}" "${LOGFILE}" || return 1
 }
 
 start() {
@@ -37,24 +42,24 @@ start() {
 
        if [ -n "${RC_UNAME}" ]; then
                # running on baselayout-2/openrc
-               start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \
-               --pidfile ${PID} \
-               --exec ${CORE} -- --logfile=${LOGFILE} --loglevel=${LOGLEVEL:-"Info"} \
-               --listen=${LISTEN:-"0.0.0.0"} --port=${PORT:-"4242"} \
-               --configdir=${CONFIGDIR:-"/var/lib/quassel/"}
+               start-stop-daemon --start --user "${QUASSEL_USER}" --background --make-pidfile \
+               --pidfile "${PID}" \
+               --exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
+               --listen="${LISTEN}" --port="${PORT}" \
+               --configdir="${CONFIGDIR}"
        else
                # running on baselayout-1
-               start-stop-daemon --start --chuid ${QUASSEL_USER} --background --make-pidfile \
-               --pidfile ${PID} --env HOME="/var/lib/quassel/" \
-               --exec ${CORE} -- --logfile=${LOGFILE} --loglevel=${LOGLEVEL:-"Info"} \
-               --listen=${LISTEN:-"0.0.0.0"} --port=${PORT:-"4242"} \
-               --configdir=${CONFIGDIR:-"/var/lib/quassel/"}
+               start-stop-daemon --start --chuid "${QUASSEL_USER}" --background --make-pidfile \
+               --pidfile "${PID}" --env HOME="${CONFIGDIR}" \
+               --exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
+               --listen="${LISTEN}" --port="${PORT}" \
+               --configdir="${CONFIGDIR}"
        fi
        eend $?
 }
 
 stop() {
        ebegin "Stopping Quassel Core"
-       start-stop-daemon --stop --pidfile ${PID} --exec ${CORE}
+       start-stop-daemon --stop --pidfile "${PID}" --exec "${CORE}"
        eend $?
 }

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index ae2b56a0032bebcbb67ba8374772c15f66d16197..422970bebf2536ec526091c391069fbfdd697b1d 100644 (file)
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.39 2010/07/03 08:26:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.40 2010/07/03 10:30:54 reavertm Exp $
 
 EAPI="2"
 
@@ -139,6 +139,6 @@ pkg_postinst() {
                ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
                ewarn "to: ${QUASSEL_DIR}."
                echo
-               ewarn "For migration. Stop the core, move the files to new location and then start server again."
+               ewarn "For migration, stop the core, move quasselcore files (pretty much everything apart from quasselclient.conf and settings.qss) into new location and then start server again."
        fi
 }