games-fps/redeclipse: fix dosym and wrapper, fix bug 647170

Fixed dosym syntax to install the symlink in the correct location.
Fixed wrapper script conditional to evaluate script call name
correctly.

Closes: https://bugs.gentoo.org/647170
Closes: https://github.com/gentoo/gentoo/pull/7142
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/games-fps/redeclipse/files/redeclipse b/games-fps/redeclipse/files/redeclipse
index 667765d11d93a7d5d25fa45d5c6cb071b17332a3..9f2c62fead05bf1f7bd371d27646be2c2de51def 100644 (file)
--- a/games-fps/redeclipse/files/redeclipse
+++ b/games-fps/redeclipse/files/redeclipse
@@ -7,4 +7,4 @@
 SERVER=/usr/bin/redeclipse_server_linux
 CLIENT=/usr/bin/redeclipse_linux
 cd /usr/share/redeclipse || exit 1
-[ "$0" = "redeclipse_server" ] && exec $SERVER || exec $CLIENT
+[ "${0##*/}" = "redeclipse_server" ] && exec "${SERVER}" || exec "${CLIENT}"

diff --git a/games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild b/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
similarity index 97%
rename from games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild
rename to games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
index 8d7b902e19d77f078809083aca093abfd5913248..f809f77f15133973ebcf204571b7136b6873fe11 100644 (file)
--- a/games-fps/redeclipse/redeclipse-1.6.0-r1.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
@@ -78,6 +78,5 @@ src_install() {
        dodoc readme.txt doc/examples/servinit.cfg
 
        dobin "${FILESDIR}/redeclipse"
-       cd /usr/bin || die
-       dosym redeclipse redeclipse_server
+       dosym redeclipse /usr/bin/redeclipse_server
 }