From 9bd61d5d8895c3ff586ebd2e7f76ebb62c21f320 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Apr 2015 06:21:43 +0200 Subject: [PATCH] intellij-idea-community-edition: make this work on x86 and x86_64. - Move to /usr/share. - Remove x86_64 bins on x86, and viceversa. --- .../intellij-idea-community-edition/template | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index eee9faa2577..ada7041b2f6 100644 --- a/srcpkgs/intellij-idea-community-edition/template +++ b/srcpkgs/intellij-idea-community-edition/template @@ -1,7 +1,8 @@ +# Template file for 'intellij-idea-community-edition' pkgname=intellij-idea-community-edition version=14.1.1 _tarversion=141.178.9 -revision=1 +revision=2 depends="virtual?java-environment giflib libXtst" short_desc="Java integrated development environment" maintainer="Adrian Siekierka " @@ -13,22 +14,25 @@ checksum=32db2d24c0412a35babaccf081f5a0b0906e4a407aa97131514dcbf3ba8e1926 only_for_archs="i686 x86_64" do_install() { - vmkdir "usr/bin" - vmkdir "usr/lib/intellij-idea" + vmkdir usr/bin + vmkdir usr/share/intellij-idea - mv bin lib plugins ${DESTDIR}/usr/lib/intellij-idea - rm -rf "${DESTDIR}"usr/lib/intellij-idea/lib/libpty/macosx - rm -rf "${DESTDIR}"usr/lib/intellij-idea/lib/libpty/win/x86_64 - rm "${DESTDIR}"usr/lib/intellij-idea/plugins/gradle/lib/native-platform-freebsd-amd64-0.10.jar - rm "${DESTDIR}"usr/lib/intellij-idea/plugins/gradle/lib/native-platform-osx-amd64-0.10.jar - rm "${DESTDIR}"usr/lib/intellij-idea/plugins/gradle/lib/native-platform-windows-amd64-0.10.jar - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - rm "${DESTDIR}"usr/lib/intellij-idea/bin/libbreakgen64.so - rm "${DESTDIR}"usr/lib/intellij-idea/bin/fsnotifier64 - rm "${DESTDIR}"usr/lib/intellij-idea/lib/libpty/linux/x86_64 - rm "${DESTDIR}"usr/lib/intellij-idea/lib/libpty/linux/x86_64/libpty.so - rm "${DESTDIR}"usr/lib/intellij-idea/plugins/gradle/lib/native-platform-linux-amd64-0.10.jar + mv bin lib plugins ${DESTDIR}/usr/share/intellij-idea + rm -rf ${DESTDIR}/usr/share/intellij-idea/lib/libpty/macosx + rm -rf ${DESTDIR}/usr/share/intellij-idea/lib/libpty/win/x86_64 + rm ${DESTDIR}/usr/share/intellij-idea/plugins/gradle/lib/native-platform-freebsd-amd64-0.10.jar + rm ${DESTDIR}/usr/share/intellij-idea/plugins/gradle/lib/native-platform-osx-amd64-0.10.jar + rm ${DESTDIR}/usr/share/intellij-idea/plugins/gradle/lib/native-platform-windows-amd64-0.10.jar + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + rm ${DESTDIR}/usr/share/intellij-idea/bin/libbreakgen.so + rm ${DESTDIR}/usr/share/intellij-idea/bin/fsnotifier + rm ${DESTDIR}/usr/share/intellij-idea/lib/libpty/linux/x86/libpty.so + else + rm ${DESTDIR}/usr/share/intellij-idea/bin/libbreakgen64.so + rm ${DESTDIR}/usr/share/intellij-idea/bin/fsnotifier64 + rm ${DESTDIR}/usr/share/intellij-idea/lib/libpty/linux/x86_64/libpty.so + rm ${DESTDIR}/usr/share/intellij-idea/plugins/gradle/lib/native-platform-linux-amd64-0.10.jar fi - ln -sf /usr/lib/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea + ln -sf /usr/share/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea }