Update and fix

2 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b787437aff13..bc007a081374 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-studio-system
 	pkgdesc = The official Android IDE (Stable branch)
-	pkgver = 2021.3.1.17
+	pkgver = 2022.1.1.19
 	pkgrel = 1
 	url = https://developer.android.com/
 	arch = x86_64
@@ -9,11 +9,13 @@ pkgbase = android-studio-system
 	depends = libxtst
 	depends = java-environment=11
 	optdepends = ncurses5-compat-libs: native debugger support
+	provides = android-studio
+	conflicts = android-studio
 	options = !strip
-	source = https://dl.google.com/dl/android/studio/ide-zips/2021.3.1.17/android-studio-2021.3.1.17-linux.tar.gz
+	source = https://dl.google.com/dl/android/studio/ide-zips/2022.1.1.19/android-studio-2022.1.1.19-linux.tar.gz
 	source = android-studio.desktop
 	source = license.html
-	sha256sums = 89adb0ce0ffa46b7894e7bfedb142b1f5d52c43c171e6a6cb9a95a49f77756ca
+	sha256sums = 96ec44e9ad82f3a241dbc7b3b88655e3d4f2137d784b545c3574270906a68d40
 	sha256sums = 73cd2dde1d0f99aaba5baad1e2b91c834edd5db3c817f6fb78868d102360d3c4
 	sha256sums = 9a7563f7fb88c9a83df6cee9731660dc73a039ab594747e9e774916275b2e23e
 
diff --git a/PKGBUILD b/PKGBUILD
index ae1ca2e9214b..25c913cd65e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # Maintainer: Kordian Bruck <k@bruck.me>
 
 pkgname=android-studio-system
-pkgver=2021.3.1.17
+pkgver=2022.1.1.19
 pkgrel=1
 pkgdesc="The official Android IDE (Stable branch)"
 arch=('x86_64')
@@ -24,26 +24,28 @@ options=('!strip')
 source=("https://dl.google.com/dl/android/studio/ide-zips/$pkgver/android-studio-$pkgver-linux.tar.gz"
         "android-studio.desktop"
         "license.html")
-sha256sums=('89adb0ce0ffa46b7894e7bfedb142b1f5d52c43c171e6a6cb9a95a49f77756ca'
+sha256sums=('96ec44e9ad82f3a241dbc7b3b88655e3d4f2137d784b545c3574270906a68d40'
             '73cd2dde1d0f99aaba5baad1e2b91c834edd5db3c817f6fb78868d102360d3c4'
             '9a7563f7fb88c9a83df6cee9731660dc73a039ab594747e9e774916275b2e23e')
+provides=("android-studio")
+conflicts=("android-studio")
 
 package() {
-  cd $srcdir/$pkgname
+  cd $srcdir/android-studio
 
   # Install the application
-  install -dm 755 $pkgdir/usr/{bin,share/{licenses,pixmaps,$pkgname}}
-  cp -dr --no-preserve='ownership' bin lib plugins $pkgdir/usr/share/$pkgname
+  install -dm 755 $pkgdir/usr/{bin,share/{licenses,pixmaps,android-studio}}
+  cp -dr --no-preserve='ownership' bin lib plugins $pkgdir/usr/share/android-studio
   cp -dr --no-preserve='ownership' license $pkgdir/usr/share/licenses/idea
 
-  ln -s /usr/share/$pkgname/bin/studio.sh $pkgdir/usr/bin/$pkgname
-  ln -sf /usr/lib/jvm/java-11-openjdk/ $pkgdir/usr/share/$pkgname/jre
+  ln -s /usr/share/android-studio/bin/studio.sh $pkgdir/usr/bin/android-studio
+  ln -sf /usr/lib/jvm/java-11-openjdk/ $pkgdir/usr/share/android-studio/jbr
 
   # Copy licenses
   install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
   install -Dm644 $srcdir/license.html "${pkgdir}/usr/share/licenses/${pkgname}/license.html"
 
   # Add the icon and desktop file
-  install -Dm644 bin/studio.png $pkgdir/usr/share/pixmaps/$pkgname.png
-  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm644 bin/studio.png $pkgdir/usr/share/pixmaps/android-studio.png
+  install -Dm644 $srcdir/android-studio.desktop $pkgdir/usr/share/applications/android-studio.desktop
 }