From: Krzysztof Pawlik Date: Mon, 8 Jan 2007 22:44:55 +0000 (+0000) Subject: Fix init.d script for bug #149460 (empty GENTOO_VM). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75bd9a57858211ca00be216d9cec613e7aaaa100;p=gentoo.git Fix init.d script for bug #149460 (empty GENTOO_VM). Package-Manager: portage-2.1.2_rc4-r7 --- diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index 87c91ab78aff..51d9a90cead1 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/resin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.32 2007/01/02 22:33:47 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.33 2007/01/08 22:44:55 nelchael Exp $ + + 08 Jan 2007; Krzysiek Pawlik + files/3.0.22/resin.init: + Fix init.d script for bug #149460 (empty GENTOO_VM). 02 Jan 2007; Krzysiek Pawlik files/3.1.0/resin.conf, files/3.1.0/resin.init: diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index f74c8bd58b5f..b79423b7cc50 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -37,10 +37,10 @@ AUX 3.0.22/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 3 MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.22/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.22/resin.conf 791 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.22/resin.conf 791 -AUX 3.0.22/resin.init 817 RMD160 c65d1c0260163242631cae4b4536aac4b923c2d7 SHA1 e609e812d7277fcefd3bdc2e6f5b5107ce45c760 SHA256 a4309f92c7b46b3adc717baaecc97aa80ffd4562d6f27d757cdfdac2ee49852e -MD5 cfe5d87efbe6b8cafbe3581d72816d6d files/3.0.22/resin.init 817 -RMD160 c65d1c0260163242631cae4b4536aac4b923c2d7 files/3.0.22/resin.init 817 -SHA256 a4309f92c7b46b3adc717baaecc97aa80ffd4562d6f27d757cdfdac2ee49852e files/3.0.22/resin.init 817 +AUX 3.0.22/resin.init 955 RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 SHA1 6c2afd3d5edad63baba94bf07fb814ea3fd48481 SHA256 2dfc51c94319d4cccd5ac5086ea3761a4d68a1e2585492790919cd0138fb4175 +MD5 9f676cf44140395b22cdd5b04ec0aef9 files/3.0.22/resin.init 955 +RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 files/3.0.22/resin.init 955 +SHA256 2dfc51c94319d4cccd5ac5086ea3761a4d68a1e2585492790919cd0138fb4175 files/3.0.22/resin.init 955 AUX 3.1.0/resin-3.1.0-gentoo.patch 6340 RMD160 a7945c5edff0c041e3fbcaab0a2125265086a813 SHA1 d7899a942369ffd6ebe29b94e69b8848fa944c46 SHA256 fb7daf247ed4866c5767b8173a26053f24ad69d453b8e4b82a6766b10a6b451f MD5 8cb00aa0c25e3db7e92d39afc6f46da5 files/3.1.0/resin-3.1.0-gentoo.patch 6340 RMD160 a7945c5edff0c041e3fbcaab0a2125265086a813 files/3.1.0/resin-3.1.0-gentoo.patch 6340 @@ -73,10 +73,10 @@ EBUILD resin-3.1.0.ebuild 3419 RMD160 fd2b1b315a453d856fcbbed7dfb9c1aa2861e86b S MD5 4777e3ed6fde6990f9898a60b2d1fd80 resin-3.1.0.ebuild 3419 RMD160 fd2b1b315a453d856fcbbed7dfb9c1aa2861e86b resin-3.1.0.ebuild 3419 SHA256 5ba8f8651adb8fe8f054f5b469b2e38dfa2010eca8db94cc4d3d42c3823c3e0a resin-3.1.0.ebuild 3419 -MISC ChangeLog 7462 RMD160 929e9cd2ef36efea23e927fa23c01437603e9e69 SHA1 5610536f041ee9e2b08fcdff4bce8f3cdeb7662c SHA256 f20212a27f6cec4a443e1b20753a8c770baf61a9474c00f0c42ee4b5fcce2868 -MD5 66962c3d982e4d6e226afdeff55a1d01 ChangeLog 7462 -RMD160 929e9cd2ef36efea23e927fa23c01437603e9e69 ChangeLog 7462 -SHA256 f20212a27f6cec4a443e1b20753a8c770baf61a9474c00f0c42ee4b5fcce2868 ChangeLog 7462 +MISC ChangeLog 7598 RMD160 b16a17e55b07d421fd46bb5f837c41fbdb4f9cea SHA1 7b29f7f08b367dcf7e01248473e91fb97b039b21 SHA256 d07b99173441e28e17b35ef231d02d3e1129a6f8594de0708d550d95c6e875e6 +MD5 eb510a78d1f2761acec0bef5604fe066 ChangeLog 7598 +RMD160 b16a17e55b07d421fd46bb5f837c41fbdb4f9cea ChangeLog 7598 +SHA256 d07b99173441e28e17b35ef231d02d3e1129a6f8594de0708d550d95c6e875e6 ChangeLog 7598 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229 @@ -96,7 +96,7 @@ SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFmt4Cgo/w9rxVVVERAgF2AKC5FkfGFlnZmP7Bxjfcnzojds1WvQCfcUfW -uNQ23v05afSlcWtLS6Qoya0= -=04TS +iD8DBQFFosmngo/w9rxVVVERAje5AKCW0gxFyYU1q4o3K9Bmqy+542haAACgjsDS +HByODexAqRelaKxXvLFyRs8= +=ZCcg -----END PGP SIGNATURE----- diff --git a/www-servers/resin/files/3.0.22/resin.init b/www-servers/resin/files/3.0.22/resin.init index 6a66fb947c5a..075eb2e40e5b 100644 --- a/www-servers/resin/files/3.0.22/resin.init +++ b/www-servers/resin/files/3.0.22/resin.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.22/resin.init,v 1.1 2006/11/19 12:23:22 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.22/resin.init,v 1.2 2007/01/08 22:44:55 nelchael Exp $ depend() { need net @@ -9,14 +9,18 @@ depend() { } start() { - export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O) + JAVA_HOME=$(java-config -O) + [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME ebegin "Starting Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}" eend $? } stop() { - export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O) + JAVA_HOME=$(java-config -O) + [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME ebegin "Stopping Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}" eend $?