fix loader script to use desired version of ruby

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 19 insertions, 29 deletions

diff --git a/app-admin/eselect-metasploit/ChangeLog b/app-admin/eselect-metasploit/ChangeLog
index e8497b174ffe..7a3370f043dc 100644
--- a/app-admin/eselect-metasploit/ChangeLog
+++ b/app-admin/eselect-metasploit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-metasploit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/ChangeLog,v 1.8 2014/10/09 03:29:11 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/ChangeLog,v 1.9 2015/01/02 20:48:31 zerochaos Exp $
+
+*eselect-metasploit-0.16 (02 Jan 2015)
+
+  02 Jan 2015;  <zero@gentoo.org> +eselect-metasploit-0.16.ebuild,
+  +files/msfloader-0.16, -eselect-metasploit-0.15.ebuild, -files/msfloader-0.15:
+  fix loader script to use desired version of ruby
 
 *eselect-metasploit-0.15 (09 Oct 2014)
 
diff --git a/app-admin/eselect-metasploit/Manifest b/app-admin/eselect-metasploit/Manifest
index 11338df7549e..07e11e63853e 100644
--- a/app-admin/eselect-metasploit/Manifest
+++ b/app-admin/eselect-metasploit/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 91metasploit 301 SHA256 40def76822cd8e068b53b64af00eb46cf0246afda58356c94ef7c30bb742344c SHA512 60c1633dba13a5614649f51e9c4b79dde9944bac3c81dba26b5e97d3589985ba66d05c73093b68bef2af150932d534fc3d17c223de1c68a13b266ba219c55f9b WHIRLPOOL cd8122211b5069c9bc91403b35bd05318ea49955c4d19c9774a6fceadb005e13a670a7a8c10346b12bd5de01c675d0baf89ff6e6fce599bde043f69e11d02ef3
 AUX metasploit.eselect-0.13 5200 SHA256 acbe25f8388e815b2c088e5cc5174c52d73b879a49c88ee7e19cd2e88acaecc8 SHA512 7a56614db0104d84e5ea18d45de42b0d35f8789d91625cfffd169153dae4c25150868a4a02e38a221ac2e198740596f5f9a35ef492dbe39565bcae2a5f99842d WHIRLPOOL 8f342bd1738fff00d34584392e322082639786f233f4f089f8986c78de21f9a4d5aaff5679745f0e6b75ffca9827490fc893633faf7ccfc7cc8b559f860a97d3
-AUX msfloader-0.15 994 SHA256 248d25b0b01a9c0c1d401f18c53f153f693e4ca15c0b0f40f71fc056eb199075 SHA512 c506a712ce2713d0bac61a679d09c81727db0c9ec93dae8080e5f5cc57e488533892a1c0880a22c53ea3ae803706feeae6e22c8a884e7618c0f4f28bfee495ee WHIRLPOOL 0f3c1d966105932e791d1b03c477d31320b487bca18201d6508fb00d40576ae9becdb52e33c495c81f67505b722e02ecbfd250fc86ac5f1922b81fea549d6d1e
+AUX msfloader-0.16 1156 SHA256 e7cef38a60d3a2abaa0dac02e4d19be5cf9ae5c63dbe46b7d9c06e360311165f SHA512 8b16f37892fa59df912c6a67413b505f1e192c88d57635ba0f91d768c4a55ab856471ce78f4f21c990d0b250736bdae8129a70b7459e9a82ce291fe631e1361d WHIRLPOOL e968c3cafc3e037eb5ab849dd4db516bdae60c7c431a7455dcf81bdf27604dcdec37b809e5035ae7f6498de354c75e748b6a48d711db523d1adc868041ed3534
 AUX msfrpcd.confd 370 SHA256 8b437413fb2e1d26161ce4232cb7d44cfd41d0923d18a82ac984a89a89c887f2 SHA512 88a52427233bc82dc36d8f627edee84ba6675cddcc4539bb3a28cfe6fd7fba673875d62a150dfa5314756f11a6b1a95453966b31a2ae1f9820c6ef936d463f90 WHIRLPOOL 2b704c60d06fc03ed1d65eecffd38e402342a3b4c5bb6d6817e0ed7c745944dfa38358bca5dfe5ae24cc0e0f9375cefd6b046f3630ec3c9650569b86679e52d8
 AUX msfrpcd.initd 595 SHA256 8ed133c85877a8509c85703b738e0286d56c57620b251f98eaffa33e31ad64dd SHA512 62f5c7ae84078e76cbdaa4dccb3fa67871491c53ce7faa07fb75c05c91b25d6812adac90ad6868759b79d9382548bff4383760d604789a12c6537cadb5977873 WHIRLPOOL 1b27b7600ae097e0d4e9717d709d87bab103bcaa76ff852e2179a0d33888bfab04751ac865a9e54f6bb2e292d670098a1005a44e61001bbd0d6b674da6a1e36d
-EBUILD eselect-metasploit-0.15.ebuild 1049 SHA256 55c8c29c5ea3abcb3abcdfd59f931f05495dc1b1611790236d2fb0459146e9b1 SHA512 03fc45e2335acc134bdf46d4864cb4f6c7e75b5af773d79979b2a20e05d25580fba856b19a0173016fb08f5f9f2953f68fb831c4c74c5781d9a536ffe9df014d WHIRLPOOL 33702eb91cab4ff87935bf4727e6ee0b8b501be6d5c01fc8ea027f496b3c9b78186f36afc290b9367fc5aa31c97b434c98d796456ea90d544716da9b49f6874e
-MISC ChangeLog 2134 SHA256 163dff31f41f6c3f79b115e12d270097c5cae352dca731ec080cd0eb2ac80eed SHA512 cc1435b289fd23ca4fb3ab4c47105f9074e415bf62b29383c37fc73632b26561801d18586c8d12d2a96a22693b97b7c2d75c2148b8d78c927540ff9f118ccfc3 WHIRLPOOL df5fd12e238954993c649b4f98b3f05f93a3d6c2d75e9a11af6186bf3602ecd03e2f4413cbaf1678d3af821743ee1b502b74ce65e65b318bacb6eb07e5b7513a
+EBUILD eselect-metasploit-0.16.ebuild 1049 SHA256 38a5a9c3439bc30fd65b8b6a30f6763c8b9304638d0e50f11146d6b904282fa1 SHA512 244310508e6fc1dda22971dc2f40373db7092844411b7d9807cfa7534fe7ff7647c8f12c1185119540b007b27650c9a8136a293c8581998428739cb73bc67686 WHIRLPOOL 1660ffa70193c041c5e09dc236a7a6e07612d950389f2d2b99f9691386fabad605e18ca857d21e0455e01648512cd8391cac09dfd16baf4ad5d7af1def8f77a4
+MISC ChangeLog 2374 SHA256 94460abcb3e86df3a03274d65b9f561ad235a71885e6d160730326e5a3a8407b SHA512 0d801291454982ff1f1ab2c6a9e4bb0ba09d2a16bcc9c3bd63e5b523aeb3fa5257480ec166a9cac977a06420394abbdf92b7b63e798c2d11ccbf2c8c8a8a67e4 WHIRLPOOL 8f5af1c336693fc2947b51c29180706c4137eecfdb2238f18076b7123c82b43c4f66af0ff965381fbae71f3e2aa2f167edae26f28106df780e0111afe1c23aa9
 MISC metadata.xml 274 SHA256 fcdb6e69f3adb718ed543a83635badf4e360a57c550760997c4c5f8ea5c7193a SHA512 8b3d3358fe15d41a5bae960eb75727923c05bab81f63ab6cbab1134e9f49fe69c7e710edf051765950c57a2ef0025207d5f7c129b2bdccfca5be3ec042cf458e WHIRLPOOL 152e28545dc06eb18012d2545644b8bd223c546d10524a7c879573fb1ad265d75ff1ae8e3a95ee6777dbff155ff4ab6795841a884d3dd722579fa8ed5fa6bb49
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCgAGBQJUNgF8AAoJEKXdFCfdEflKs/sP/j8dkuvNk2ZMOVSRXIM5gS7S
-fD5qJivEdAlUN7rVJWwkqz1lYcwlX7CYQ5WzIN0S7aAG30QD7Coh9A/1dFHbMcVt
-GLsqjETmwn4QFFI7xrJiqKdoxc4ttaeEqIM9+TgoVwYT/r14z3GqxEKW1gwhSfgC
-2Sid8eR12sNw08qHtMkLnwfoLjfpNbCqoIcDHzysK+TccL1BZakmnFlmsbhLJ/5u
-pa9veaVABjtWATKKPhJW4FcnVuiQs6VWHeqA1VAwnb+H7Gq6s9+QBgOLPaJqkpjW
-hVV4M/sERR73gosFzaYh1Pe8VTjqIeLM8V47KCg8N6VsQzBa40Y0Jhtg473iPQBk
-0kPLtG34aHLDdlWj4+fJjJFvfYH8Ds7l33SOlYo2vLEndi+pk7lLcr6Mf/bf/VAS
-xOk6eqcSfnxSLeeSwtfJkVjCqSPgUsDPDfFnVlyMMt00UZjZMGARYxu1/7u7enZG
-WJDZXOuHDAR1LLbM/A59ziSd9U7sR/Zp92fw7i3vJBE4FkyuX1ejXYndlM3Bc3Sf
-K/iguKh7kmGZYTj2Y9qEex6aCx7hwPsNlKpGJ5jMljny6dPfD4mjutM/rc6UA5yN
-4RuTvbKI8z+7ztlEj4c4utpjgZyaaxvcHDH8PnoVDTkv12jKH8T6zlue8CstfVCA
-zOg22hbGE800ysdg38Fw
-=ues1
------END PGP SIGNATURE-----
diff --git a/app-admin/eselect-metasploit/eselect-metasploit-0.15.ebuild b/app-admin/eselect-metasploit/eselect-metasploit-0.16.ebuild
index 64b565d7e669..4e51c299e814 100644
--- a/app-admin/eselect-metasploit/eselect-metasploit-0.15.ebuild
+++ b/app-admin/eselect-metasploit/eselect-metasploit-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/eselect-metasploit-0.15.ebuild,v 1.1 2014/10/09 03:29:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/eselect-metasploit-0.16.ebuild,v 1.1 2015/01/02 20:48:31 zerochaos Exp $
 
 EAPI=5
 
diff --git a/app-admin/eselect-metasploit/files/msfloader-0.15 b/app-admin/eselect-metasploit/files/msfloader-0.16
index d7032e70a0b7..231275a9b1f6 100755
--- a/app-admin/eselect-metasploit/files/msfloader-0.15
+++ b/app-admin/eselect-metasploit/files/msfloader-0.16
@@ -3,6 +3,10 @@
 #todo:
 #add in optional auto starting/stopping of postgres
 
+#read the desired version of ruby from the eselected version of msf
+header="$(head -n1 /usr/lib/metasploit/msfconsole)"
+ruby="${header:2}"
+
 #normally msf makes this dir, however, this script runs first
 if [ ! -d ~/.msf4 ]; then
 	mkdir ~/.msf4
@@ -23,7 +27,7 @@ if ls -A /usr/lib/metasploit/*.gemspec > /dev/zero 2>&1; then
 fi
 
 #ensure Gemfile.lock is up to date
-BUNDLE_GEMFILE=~/.msf4/Gemfile bundle check > /dev/null 2>&1
+BUNDLE_GEMFILE=~/.msf4/Gemfile ${ruby} -S bundle check > /dev/null 2>&1
 if [ "$?" != "0" ]; then
 	if [ -f ~/.msf4/Gemfile.lock ]; then
 		rm ~/.msf4/Gemfile.lock
@@ -33,5 +37,5 @@ if [ "$?" != "0" ]; then
 fi
 
 #ready to go
-BUNDLE_GEMFILE=~/.msf4/Gemfile bundle exec /usr/lib/metasploit/$(basename $0) "$@"
+BUNDLE_GEMFILE=~/.msf4/Gemfile ${ruby} -S bundle exec /usr/lib/metasploit/$(basename $0) "$@"
 #profit