upgpkg: sublime-text-3 3.3211-3

Improved formatting
Updated description to point out that is a legacy version now
Added GNOME specific StartupWMClass option back to desktop file
Removed desktop file from /opt/sublime_text_3 directory

2 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be124a179b26..9a47d7f3b77b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sublime-text-3
-	pkgdesc = Sophisticated text editor for code, html and prose - stable build
+	pkgdesc = Sophisticated text editor for code, html and prose (legacy version)
 	pkgver = 3.3211
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.sublimetext.com/3
 	install = sublime-text-3.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index cede3fd72f55..60c2fb7a00ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=sublime-text-3
 pkgver=3.3211
-pkgrel=2
-pkgdesc="Sophisticated text editor for code, html and prose - stable build"
+pkgrel=3
+pkgdesc='Sophisticated text editor for code, html and prose (legacy version)'
 arch=('x86_64')
 url='https://www.sublimetext.com/3'
 license=('custom')
@@ -17,13 +17,14 @@ package() {
 	cd "${srcdir}"
 
 	# Adjust naming
-	sed -i 's#/opt/sublime_text/sublime_text#/opt/sublime_text_3/sublime_text#g' "sublime_text_3/sublime_text.desktop"
-	sed -i 's#Sublime Text#Sublime Text 3#g' "sublime_text_3/sublime_text.desktop"
-	sed -i 's#sublime-text#sublime-text-3#g' "sublime_text_3/sublime_text.desktop"
+	sed -i 's#/opt/sublime_text/sublime_text#/opt/sublime_text_3/sublime_text#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i 's#Sublime Text#Sublime Text 3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i 's#sublime-text#sublime-text-3#g' 'sublime_text_3/sublime_text.desktop'
 
 	# Install sublime text 3
 	install -dm755 "${pkgdir}/opt"
-	cp --preserve=mode -r "sublime_text_3" "${pkgdir}/opt/sublime_text_3"
+	cp --preserve=mode -r 'sublime_text_3' "${pkgdir}/opt/sublime_text_3"
+	rm -f "${pkgdir}/opt/sublime_text_3/sublime_text.desktop"
 
 	# Install icons
 	for res in 128x128 16x16 256x256 32x32 48x48; do
@@ -32,11 +33,12 @@ package() {
 	done
 
 	# Install desktop entry and executable
-	sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' "sublime_text_3/sublime_text.desktop"
+	sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i '\#^Icon=sublime-text-3#a StartupWMClass=sublime-text-3' 'sublime_text_3/sublime_text.desktop'
 
 	install -dm755 "${pkgdir}/usr/share/applications"
-	install -Dm644 "sublime_text_3/sublime_text.desktop" "${pkgdir}/usr/share/applications/sublime_text_3.desktop"
+	install -Dm644 'sublime_text_3/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text_3.desktop"
 
 	install -dm755 "${pkgdir}/usr/bin"
-	ln -s "/opt/sublime_text_3/sublime_text" "${pkgdir}/usr/bin/subl3"
+	ln -s '/opt/sublime_text_3/sublime_text' "${pkgdir}/usr/bin/subl3"
 }