[arch-commits] Commit in eclipse/trunk (PKGBUILD)

Jan Steffens heftig at archlinux.org
Sun Jul 5 15:19:07 UTC 2015


    Date: Sunday, July 5, 2015 @ 17:19:06
  Author: heftig
Revision: 241828

FS45559 Keep dropins dir

Modified:
  eclipse/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-05 13:21:00 UTC (rev 241827)
+++ PKGBUILD	2015-07-05 15:19:06 UTC (rev 241828)
@@ -9,7 +9,7 @@
 pkgbase=eclipse
 pkgname=(eclipse-{common,java,cpp,php})
 pkgver=4.5.0
-pkgrel=2
+pkgrel=3
 _release=mars-R
 pkgdesc="Highly extensible IDE"
 license=("EPL")
@@ -41,21 +41,26 @@
                    'f93d0f6a8fc03077887049080d332b7aa61127641ac2d815e8729f3ff3aa037a')
 
 prepare() {
+  mkdir eclipse-common
+
   for _pkg in ${pkgname[@]}; do
-    mkdir $_pkg
-
     [[ $_pkg == 'eclipse-common' ]] && continue
 
     if [[ $CARCH == x86_64 ]]; then
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
+      bsdtar -xf "$_pkg-$_release-linux-gtk-x86_64.tar.gz"
     else
-      bsdtar -C $_pkg -xf "$_pkg-$_release-linux-gtk.tar.gz"
+      bsdtar -xf "$_pkg-$_release-linux-gtk.tar.gz"
     fi
+
+    mv eclipse $_pkg
   done
 }
 
 build() {
   ./commonify ${pkgname[@]}
+
+  mkdir -p eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
 }
 
 package_eclipse-common() {
@@ -64,13 +69,13 @@
   install=eclipse.install
 
   install -d "$pkgdir/usr/lib"
-  cp -a eclipse-common/eclipse "$pkgdir/usr/lib"
+  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
 
   install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
   install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
 
   for _i in 16 32 48 256; do
-    install -Dm644 eclipse-common/eclipse/plugins/org.eclipse.platform_*/eclipse${_i}.png \
+    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse${_i}.png \
       "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
   done
 }
@@ -88,5 +93,5 @@
   esac
 
   install -d "$pkgdir/usr/lib"
-  cp -a $1/eclipse "$pkgdir/usr/lib"
+  cp -a $1 "$pkgdir/usr/lib/eclipse"
 }



More information about the arch-commits mailing list