clean up PKGBUILD

1 files changed, 28 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 621f075be0fe..9a26cf3d273a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 pkgname=pycharm-community-eap
 _buildver=183.5153.39
 _pkgver=2018.3.3
+_eap=
 pkgver=$_pkgver.$_buildver
 pkgrel=1
 epoch=2
@@ -10,27 +11,34 @@ options=('!strip')
 url='http://www.jetbrains.com/pycharm/'
 license=(Apache)
 depends=(java-environment libdbusmenu-glib)
+makedepends=(python-setuptools python2-setuptools)
 provides=(pycharm-community-edition)
 conflicts=(pycharm-community-edition)
-source=("https://download.jetbrains.com/python/pycharm-community-$_pkgver.tar.gz"{,.sha256})
-sha256sums=($(cut -f1 -d' ' "pycharm-community-$_pkgver.tar.gz.sha256") SKIP)
-PKGEXT=${PKGEXT:-'.pkg.tar'}
+if [[ $_eap = y ]]; then
+    source=("https://download.jetbrains.com/python/pycharm-community-$_buildver.tar.gz"{,.sha256})
+    sha256sums=($(cut -f1 -d' ' "pycharm-community-$_buildver.tar.gz.sha256") SKIP)
+else
+    source=("https://download.jetbrains.com/python/pycharm-community-$_pkgver.tar.gz"{,.sha256})
+    sha256sums=($(cut -f1 -d' ' "pycharm-community-$_pkgver.tar.gz.sha256") SKIP)
+fi
 
-build() {
+prepare() {
 	cat >"$srcdir/$pkgname.desktop" <<-EOF
-	[Desktop Entry]
-	Version=$pkgver
-	Type=Application
-	Name=PyCharm Community EAP
-	Exec="/opt/$pkgname/bin/pycharm.sh" %f
-	Icon=pycharm
-	Comment=$pkgdesc
-	Categories=Development;IDE;
-	Terminal=false
-	StartupNotify=true
-	StartupWMClass=jetbrains-pycharm-ce
+		[Desktop Entry]
+		Version=$pkgver
+		Type=Application
+		Name=PyCharm Community EAP
+		Exec="/opt/$pkgname/bin/pycharm.sh" %f
+		Icon=pycharm
+		Comment=$pkgdesc
+		Categories=Development;IDE;
+		Terminal=false
+		StartupNotify=true
+		StartupWMClass=jetbrains-pycharm-ce
 	EOF
+}
 
+build() {
 	python2 "$srcdir/pycharm-community-$_pkgver/helpers/pydev/setup_cython.py" build_ext --inplace
 	python3 "$srcdir/pycharm-community-$_pkgver/helpers/pydev/setup_cython.py" build_ext --inplace
 }
@@ -38,19 +46,19 @@ build() {
 package() {
 	cd "$srcdir"
 	mkdir -p "$pkgdir/opt/$pkgname"
-	cp -R "$srcdir/pycharm-community-$_pkgver/"* "$pkgdir/opt/$pkgname"
+	cp -R "pycharm-community-$_pkgver/"* "$pkgdir/opt/$pkgname/"
 
-	local vmoptfile=pycharm64
+	local _vmoptfile=pycharm64
 	if [[ $CARCH = 'i686' ]]; then
 		rm -f "$pkgdir/opt/$pkgname/bin/libyjpagent-linux64.so"
 		rm -f "$pkgdir/opt/$pkgname/bin/fsnotifier64"
-		vmoptfile=pycharm
+		_vmoptfile=pycharm
 	fi
-	echo $'-Dawt.useSystemAAFontSettings=on\n-Dswing.aatext=true' >>"$pkgdir/opt/$pkgname/bin/$vmoptfile.vmoptions"
+	echo $'-Dawt.useSystemAAFontSettings=on\n-Dswing.aatext=true' >>"$pkgdir/opt/$pkgname/bin/$_vmoptfile.vmoptions"
 
 	mkdir -p "$pkgdir/usr/bin/"
 	ln -s "/opt/$pkgname/bin/pycharm.sh" "$pkgdir/usr/bin/pycharm-eap"
 	mkdir -p "$pkgdir/usr/share/pixmaps"
 	ln -s "/opt/$pkgname/bin/pycharm.png" "$pkgdir/usr/share/pixmaps/pycharm.png"
-	install -Dm755 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+	install -Dm755 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }