mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-util/idea-community: fix custom-jdk useflag in previous versions
Because of the switch to a 64 bit jdk at some point prior to even 2017.2.2 (the oldest version in the tree), the directory naming changed and so even without the custom-jdk useflag the jdk was being installed, and with the custom-jdk useflag the jdk's binaries were not correctly being marked executable Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Kyle Elbert <kcelbert@gmail.com> Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>
This commit is contained in:
committed by
Alice Ferrazzi
parent
03916dccae
commit
a3ab71a1e4
@@ -41,8 +41,8 @@ src_prepare() {
|
||||
rm bin/fsnotifier-arm || die
|
||||
fi
|
||||
if ! use custom-jdk; then
|
||||
if [[ -d jre ]]; then
|
||||
rm -r jre || die
|
||||
if [[ -d jre64 ]]; then
|
||||
rm -r jre64 || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -55,8 +55,8 @@ src_install() {
|
||||
fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
|
||||
|
||||
if use custom-jdk; then
|
||||
if [[ -d jre ]]; then
|
||||
fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
|
||||
if [[ -d jre64 ]]; then
|
||||
fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -41,8 +41,8 @@ src_prepare() {
|
||||
rm bin/fsnotifier-arm || die
|
||||
fi
|
||||
if ! use custom-jdk; then
|
||||
if [[ -d jre ]]; then
|
||||
rm -r jre || die
|
||||
if [[ -d jre64 ]]; then
|
||||
rm -r jre64 || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -55,8 +55,8 @@ src_install() {
|
||||
fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
|
||||
|
||||
if use custom-jdk; then
|
||||
if [[ -d jre ]]; then
|
||||
fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
|
||||
if [[ -d jre64 ]]; then
|
||||
fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user