[arch-commits] Commit in grails/trunk (PKGBUILD grails.sh)

[Alexander Rødseth]

    Date: Saturday, September 19, 2015 @ 00:26:20
  Author: arodseth
Revision: 140662

upgpkg: grails 3.0.7-1

Modified:
  grails/trunk/PKGBUILD
Deleted:
  grails/trunk/grails.sh

-----------+
 PKGBUILD  |   28 +++++++++-------------------
 grails.sh |    5 -----
 2 files changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-18 20:19:58 UTC (rev 140661)
+++ PKGBUILD	2015-09-18 22:26:20 UTC (rev 140662)
@@ -3,23 +3,21 @@
 
 pkgbase=grails
 pkgname=('grails' 'grails-docs')
-pkgver=3.0.1
+pkgver=3.0.7
 pkgrel=1
 pkgdesc='Groovy on rails, web framework'
 arch=('any')
 url='http://grails.org/'
 license=('APACHE')
-makedepends=('apache-ant' 'unzip')
+makedepends=('apache-ant' 'unzip' 'setconf')
 optdepends=('groovy: the groovy programming language'
             'grails-docs: documentation for grails')
 options=('!emptydirs')
 noextract=("${pkgname[1]}-$pkgver.zip")
 source=("https://github.com/grails/grails-core/releases/download/v$pkgver/grails-$pkgver.zip"
-        "https://github.com/grails/grails-doc/releases/download/v$pkgver/grails-docs-$pkgver.zip"
-        "$pkgbase.sh")
-sha256sums=('c58da97ad7fb9635c6fb5631755501b97d6ce9ee6668dc12f0722928ffa5abee'
-            'eabbd3a187cc63793d8214c27a1d9a3a19203cf7040b2957adcba508c070e62e'
-            '15553ae56fd39f049edfa65a05413ef6d68ae37ed1ccc69570bf81e888239bf4')
+        "https://github.com/grails/grails-doc/releases/download/v$pkgver/grails-docs-$pkgver.zip")
+sha256sums=('d99b11e4a8fb1f5a155f1784f482316df96e63d094d5d083a62bc37905380800'
+            '328b0179e43fbf2723cf9f7b2d2208289d5c1a39d0eeee7ab0c55b85febce2b8')
 
 prepare() {
   cd "${pkgname[0]}-$pkgver"
@@ -26,6 +24,9 @@
 
   # profile.d script
   echo 'export GRAILS_HOME=/usr/share/grails' > "$srcdir/$pkgbase.profile"
+
+  # set APP_HOME
+  setconf bin/grails APP_HOME /usr/share/grails
 }
 
 package_grails() {
@@ -35,19 +36,8 @@
 
   install -d "$pkgdir/usr/share/pixmaps/"
   cp -r "$srcdir/$pkgname-$pkgver" "$pkgdir/usr/share/$pkgname"
-
-  # wrapper scripts
-  install -Dm755 bin/startGrails \
-    "$pkgdir/usr/share/$pkgname/startGrails"
-  install -Dm755 "../$pkgname.sh" \
-    "$pkgdir/usr/bin/$pkgname"
-  install -Dm755 "../$pkgname.sh" \
-    "$pkgdir/usr/share/$pkgname/bin/$pkgname"
-
-  # icons
+  install -Dm755 bin/grails "$pkgdir/usr/bin/grails"
   cp media/icons/*.png "$pkgdir/usr/share/pixmaps/"
-  
-  # profile.d script
   install -Dm755 "$srcdir/$pkgbase.profile" "$pkgdir/etc/profile.d/$pkgname.sh"
 
   # clean up

Deleted: grails.sh
===================================================================
--- grails.sh	2015-09-18 20:19:58 UTC (rev 140661)
+++ grails.sh	2015-09-18 22:26:20 UTC (rev 140662)
@@ -1,5 +0,0 @@
-#!/bin/sh
-[[ -f $GRAILS_HOME/startGrails ]] || GRAILS_HOME=/usr/share/grails
-DIRNAME=$GRAILS_HOME
-. "$DIRNAME/startGrails"
-startGrails org.codehaus.groovy.grails.cli.GrailsScriptRunner "$@"