summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2024-01-10 00:31:57 +0300
committerYurii Kolesnykov2024-01-10 00:32:08 +0300
commitf4b09cb9645ede38c197b91f001c67dbb20680c7 (patch)
tree795c91ecf6bbef724b5303c91eeb076ad19d332a
parentfc6b34614f407fbe680f076b0f4ba16c123e80b9 (diff)
downloadaur-f4b09cb9645ede38c197b91f001c67dbb20680c7.tar.gz
Revert previous changes in build()
Closes #26 Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD18
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8fa475b7abb..6aba6184b7ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = android-studio-beta
pkgdesc = The Official Android IDE (Beta branch)
pkgver = 2023.2.1.19
- pkgrel = 1
+ pkgrel = 2
url = https://developer.android.com/studio/preview
arch = i686
arch = x86_64
license = APACHE
+ makedepends = zip
depends = fontconfig
depends = freetype2
depends = libxml2
diff --git a/PKGBUILD b/PKGBUILD
index 91e84875a829..6e0465e5fb94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@
PKGEXT='.pkg.tar'
_pkgname=android-studio
-_beta=1
pkgname="${_pkgname}-beta"
pkgver=2023.2.1.19
-pkgrel=1
+pkgrel=2
pkgdesc='The Official Android IDE (Beta branch)'
arch=('i686' 'x86_64')
url='https://developer.android.com/studio/preview'
license=('APACHE')
+makedepends=('zip')
depends=(
'fontconfig'
'freetype2'
@@ -57,18 +57,14 @@ if [ "${CARCH}" = "i686" ]; then
fi
build() {
- if [[ "${_beta}" -eq 0 ]]; then return 0; fi
-
cd "${_pkgname}"
# Change the product name to produce a unique WM_CLASS attribute
- mkdir -p _resources
- bsdtar -xf lib/resources.jar -C _resources
- pushd _resources
- sed "s/\"Studio\"/\"Studio Beta\"/" -i idea/AndroidStudioApplicationInfo.xml
- bsdtar -acf ../lib/resources.jar .
- popd
- rm -r _resources
+ mkdir -p idea
+ bsdtar -Oxf lib/resources.jar idea/AndroidStudioApplicationInfo.xml \
+ | sed "s/\"Studio\"/\"Studio Beta\"/" > idea/AndroidStudioApplicationInfo.xml
+ zip -r lib/resources.jar idea
+ rm -r idea
}
package() {