Udev rules commented out, desktop file updated

3 files changed, 40 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26fc4c7ff231..29ec61b3a7fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = stm32cubeide
 	pkgdesc = Integrated Development Environment for STM32
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://my.st.com/content/my_st_com/en/products/development-tools/software-development-tools/stm32-software-development-tools/stm32-ides/stm32cubeide.html
 	arch = x86_64
 	license = Commercial
+	depends = java-runtime
+	depends = jlink-software-and-documentation
 	optdepends = stlink
-	optdepends = jlink-software-and-documentation
-	conflicts = truestudio
 	options = !strip
 	source = local://en.st-stm32cubeide_1.0.0_2872_20190423_2022_amd64.sh.zip
+	source = stm32cubeide.desktop
 	sha256sums = 28929f7260e9be6350e4a45ce53c590f85a3096891dc80a4657c022c42a3949a
+	sha256sums = 9f034695b98dd8aec59aec9f51e78a7daffd601aacf9a302b5f46de84c7ad9f1
 
 pkgname = stm32cubeide
 
diff --git a/PKGBUILD b/PKGBUILD
index a671ba545134..d97eb2d82a80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 pkgname="stm32cubeide"
 pkgver=1.0.0
 _pkgver_ext="$pkgver"_2872_20190423_2022
-pkgrel=1
+pkgrel=2
 pkgdesc="Integrated Development Environment for STM32"
 arch=("x86_64")
-depends=()
-optdepends=('stlink' 'jlink-software-and-documentation')
-conflicts=('truestudio')
+depends=('java-runtime' 'jlink-software-and-documentation')
+optdepends=('stlink')
+conflicts=()
 url="https://my.st.com/content/my_st_com/en/products/development-tools/software-development-tools/stm32-software-development-tools/stm32-ides/stm32cubeide.html"
 license=('Commercial')
 options=(!strip)
@@ -24,8 +24,10 @@ if [ ! -f ${PWD}/en.st-stm32cubeide_${_pkgver_ext}_amd64.sh.zip ]; then
 	fi
 fi
 
-source=("local://en.st-stm32cubeide_${_pkgver_ext}_amd64.sh.zip")
-sha256sums=('28929f7260e9be6350e4a45ce53c590f85a3096891dc80a4657c022c42a3949a')
+source=("local://en.st-stm32cubeide_${_pkgver_ext}_amd64.sh.zip"
+	$pkgname.desktop)
+sha256sums=('28929f7260e9be6350e4a45ce53c590f85a3096891dc80a4657c022c42a3949a'
+	'9f034695b98dd8aec59aec9f51e78a7daffd601aacf9a302b5f46de84c7ad9f1')
 
 prepare(){
 	cd "$srcdir"
@@ -53,33 +55,24 @@ package() {
 	cp "${srcdir}/build/stlink-server/stlink-server" "${pkgdir}/usr/bin/"
 	chmod 0755 "${pkgdir}/usr/bin/stlink-server"
 	
-	msg2 'Installing STlink udev rules'
-	cd "$srcdir/build/stlink-udev"
-        tar zxf st-stlink-udev-rules-*-linux-all.tar.gz
-        cd "${pkgdir}/"
-        gzip -dc "$srcdir/build/stlink-udev/st-stlink-udev-rules.sw" | tar -xpf -
+	msg2 'Instalation of STlink udev rules skipped'
+	#msg2 'Installing STlink udev rules'
+	#cd "$srcdir/build/stlink-udev"
+        #tar zxf st-stlink-udev-rules-*-linux-all.tar.gz
+        #cd "${pkgdir}/"
+        #gzip -dc "$srcdir/build/stlink-udev/st-stlink-udev-rules.sw" | tar -xpf -
         
-        msg2 'Installing JLink udev rules'
-	cd "$srcdir/build/jlink-udev"
-        tar zxf segger-jlink-udev-rules-*-linux-noarch.tar.gz
-        cd "${pkgdir}/"
-        gzip -dc "$srcdir/build/jlink-udev/segger-jlink-udev-rules.sw" | tar -xpf -
+        msg2 'Instalation of JLink udev rules skipped'
+        #msg2 'Installing JLink udev rules'
+	#cd "$srcdir/build/jlink-udev"
+        #tar zxf segger-jlink-udev-rules-*-linux-noarch.tar.gz
+        #cd "${pkgdir}/"
+        #gzip -dc "$srcdir/build/jlink-udev/segger-jlink-udev-rules.sw" | tar -xpf -
         
         msg2 'Installing desktop shortcuts'
-	install -d -m755 "${pkgdir}/usr/share/applications"
-	cat <<EOF > "${pkgdir}/usr/share/applications/st-stm32cubeide_${pkgver}.desktop"
-[Desktop Entry]
-Name=STMicroelectronics STM32CubeIDE ${version}
-Comment=STMicroelectronics STM32CubeIDE ${version}
-GenericName=STM32CubeIDE
-Exec=Exec=/opt/${pkgname}/stm32cubeide %F
-Icon=Exec=/opt/${pkgname}/icon.xpm
-Path=Exec=/opt/${pkgname}/
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=Development
-EOF
-   
+	install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	
+	msg2 'Cleaning build folder'
+	rm -rf "${srcdir}/build"
 }
 
diff --git a/stm32cubeide.desktop b/stm32cubeide.desktop
new file mode 100644
index 000000000000..c6307b6a31cb
--- /dev/null
+++ b/stm32cubeide.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=STMicroelectronics STM32CubeIDE 1.0.0
+Comment=STMicroelectronics STM32CubeIDE 1.0.0
+GenericName=STM32CubeIDE
+Exec=/opt/stm32cubeide/stm32cubeide %F
+Icon=/opt/stm32cubeide/icon.xpm
+Path=/opt/stm32cubeide/
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Development