install /usr/bin/gradle4 instead of gradle; remove conflict with gradle

5 files changed, 41 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17ad4c8c75eb..411df888e709 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gradle4
 	pkgdesc = Powerful build system for the JVM
 	pkgver = 4.10.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gradle.org/
 	arch = any
 	license = Apache
@@ -13,20 +13,15 @@ pkgbase = gradle4
 	sha512sums = f38e9b26e22948366acf6580d6f38e2c88c3791c425b24922368fe1bc78c744fa516a03ffdbef02e3755859da620a6259997d4b4e5f97e3dc8cb49b74a694616
 
 pkgname = gradle4
-	provides = gradle
-	conflicts = gradle
+	install = gradle4.install
 
 pkgname = gradle4-doc
 	pkgdesc = Powerful build system for the JVM (documentation and samples)
 	optdepends = gradle4
-	provides = gradle-doc
-	conflicts = gradle-doc
 	options = !strip
 
 pkgname = gradle4-src
 	pkgdesc = Powerful build system for the JVM (sources)
 	optdepends = gradle4
-	provides = gradle-src
-	conflicts = gradle-src
 	options = !strip
 
diff --git a/PKGBUILD b/PKGBUILD
index bbb1f5b2cfd7..927740ebdd24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 pkgbase=gradle4
 pkgname=('gradle4' 'gradle4-doc' 'gradle4-src')
 pkgver=4.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Powerful build system for the JVM'
 url='https://gradle.org/'
 arch=('any')
@@ -21,63 +21,58 @@ sha512sums=('a688267399a1632d86e8c3d28e34ea58992bba64968f4d01b6c3e4ea63081167c55
             'f38e9b26e22948366acf6580d6f38e2c88c3791c425b24922368fe1bc78c744fa516a03ffdbef02e3755859da620a6259997d4b4e5f97e3dc8cb49b74a694616')
 
 package_gradle4() {
-  conflicts=('gradle')
-  provides=('gradle')
-
+  install="gradle4.install"
+  
   cd gradle-${pkgver}
 
   # install profile.d script
-  install -Dm 755 "${srcdir}/gradle.sh" "${pkgdir}/etc/profile.d/gradle.sh"
+  install -Dm 755 "${srcdir}/gradle.sh" "${pkgdir}/etc/profile.d/$pkgbase.sh"
 
   # create the necessary directory structure
-  install -d "${pkgdir}/usr/share/java/gradle/bin"
-  install -d "${pkgdir}/usr/share/java/gradle/lib/plugins"
-  install -d "${pkgdir}/usr/share/java/gradle/init.d"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/bin"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/lib/plugins"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/init.d"
   install -d "${pkgdir}/usr/bin"
 
   # copy across jar files
-  install -Dm 644 lib/*.jar "${pkgdir}/usr/share/java/gradle/lib"
-  install -Dm 644 lib/plugins/*.jar "${pkgdir}/usr/share/java/gradle/lib/plugins"
+  install -Dm 644 lib/*.jar "${pkgdir}/usr/share/java/$pkgbase/lib"
+  install -Dm 644 lib/plugins/*.jar "${pkgdir}/usr/share/java/$pkgbase/lib/plugins"
 
   # copy across supporting text documentation and scripts
-  install -m 644 NOTICE "${pkgdir}/usr/share/java/gradle"
-  install -m 644 LICENSE "${pkgdir}/usr/share/java/gradle"
-  install -m 644 *.html "${pkgdir}/usr/share/java/gradle"
-  install -m 755 bin/gradle "${pkgdir}/usr/share/java/gradle/bin"
-  install -m 644 init.d/*.* "${pkgdir}/usr/share/java/gradle/init.d"
+  install -m 644 NOTICE "${pkgdir}/usr/share/java/$pkgbase"
+  install -m 644 LICENSE "${pkgdir}/usr/share/java/$pkgbase"
+  install -m 644 *.html "${pkgdir}/usr/share/java/$pkgbase"
+  install -m 755 bin/gradle "${pkgdir}/usr/share/java/$pkgbase/bin"
+  install -m 644 init.d/*.* "${pkgdir}/usr/share/java/$pkgbase/init.d"
 
   # link gradle script to /usr/bin
-  ln -s /usr/share/java/gradle/bin/gradle "${pkgdir}/usr/bin"
+  ln -s "/usr/share/java/$pkgbase/bin/gradle" "${pkgdir}/usr/bin/$pkgbase"
 }
 
 package_gradle4-doc() {
   pkgdesc='Powerful build system for the JVM (documentation and samples)'
   options=('!strip')
   optdepends=('gradle4')
-  conflicts=('gradle-doc')
-  provides=('gradle-doc')
 
   cd gradle-${pkgver}
 
   # create the necessary directory structure
-  install -d "${pkgdir}/usr/share/java/gradle/docs"
-  install -d "${pkgdir}/usr/share/java/gradle/samples"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/docs"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/samples"
 
   # copy across documentation and samples
-  cp -r docs/* "${pkgdir}/usr/share/java/gradle/docs"
-  cp -r samples/* "${pkgdir}/usr/share/java/gradle/samples"
+  cp -r docs/* "${pkgdir}/usr/share/java/$pkgbase/docs"
+  cp -r samples/* "${pkgdir}/usr/share/java/$pkgbase/samples"
 }
 
 package_gradle4-src() {
   pkgdesc='Powerful build system for the JVM (sources)'
   options=('!strip')
   optdepends=('gradle4')
-  conflicts=('gradle-src')
-  provides=('gradle-src')
 
   cd gradle-${pkgver}
-  install -d "${pkgdir}/usr/share/java/gradle/src"
-  cp -r src/* "${pkgdir}/usr/share/java/gradle/src"
+  install -d "${pkgdir}/usr/share/java/$pkgbase/src"
+  cp -r src/* "${pkgdir}/usr/share/java/$pkgbase/src"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/gradle.sh b/gradle.sh
index 1ca13764852e..f82a6d7ce638 100755
--- a/gradle.sh
+++ b/gradle.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env sh                                          
-export GRADLE_HOME=/usr/share/java/gradle                  
+#!/usr/bin/env sh
+export GRADLE_HOME=/usr/share/java/gradle
diff --git a/gradle4.install b/gradle4.install
new file mode 100755
index 000000000000..f479ae1876df
--- /dev/null
+++ b/gradle4.install
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+_gradle4_install='NOTE: To avoid conflict with gradle, this package only installs /usr/bin/gradle4
+If you want gradle4 to be your default, please run:
+    sudo ln -s gradle4 /usr/bin/gradle'
+
+post_install()
+{
+	echo "$_gradle4_install"
+}
+
+post_upgrade()
+{
+	echo "$_gradle4_install"
+}
diff --git a/update.sh b/update.sh
index ba3d27c46724..cf6b6a967246 100755
--- a/update.sh
+++ b/update.sh
@@ -3,7 +3,7 @@ set -e
 
 ver=$1
 
-sed -E -i PKGBUILD -e 's|pkgver=.*|pkgver='$ver'|g'
+sed -E -i PKGBUILD -e 's|pkgver=.*|pkgver='$ver'|g' -e 's|pkgrel=.*|pkgrel=1|g'
 updpkgsums
 makepkg --printsrcinfo >.SRCINFO