upgpkg: sublime-text-3 3.3211-5

Fix title bar icon by using a launcher script instead of symlink

3 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b756795a20c..4f75fb242005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sublime-text-3
 	pkgdesc = Sophisticated text editor for code, html and prose (legacy version)
 	pkgver = 3.3211
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.sublimetext.com/3
 	install = sublime-text-3.install
 	arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = sublime-text-3
 	depends = libpng
 	depends = gtk2
 	source = https://download.sublimetext.com/sublime_text_3_build_3211_x64.tar.bz2
-	sha256sums = 0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+	source = sublime-text-3.sh
+	sha512sums = a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
+	sha512sums = ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9
 
 pkgname = sublime-text-3
diff --git a/PKGBUILD b/PKGBUILD
index 2172438ad85d..b607d65dc59c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,29 @@
 
 pkgname=sublime-text-3
 pkgver=3.3211
-pkgrel=4
+pkgrel=5
 pkgdesc='Sophisticated text editor for code, html and prose (legacy version)'
 arch=('x86_64')
 url='https://www.sublimetext.com/3'
 license=('custom')
 depends=('libpng' 'gtk2')
 install="${pkgname}.install"
-source=("https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2")
-sha256sums=('0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee')
+source=("https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2"
+	"${pkgname}.sh")
+sha512sums=('a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1'
+            'ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9')
 
-package() {
-	cd "${srcdir}"
+prepare() {
+	sed -i -e "s|@ST_PATH@|/opt/sublime_text_3|g" "${pkgname}.sh"
+
+	# Adjust naming in desktop entry
+	sed -i -e 's#Sublime Text#Sublime Text 3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i -e 's#sublime-text#sublime-text-3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i -e 's#/opt/sublime_text/sublime_text#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i -e '\#^StartupNotify=#a StartupWMClass=subl3' 'sublime_text_3/sublime_text.desktop'
+}
 
+package() {
 	# Install sublime text 3
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text_3' "${pkgdir}/opt/sublime_text_3"
@@ -27,15 +37,10 @@ package() {
 		ln -s "/opt/sublime_text_3/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text-3.png"
 	done
 
-	# Adjust naming and install desktop entry and executable
-	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#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
-	sed -i '\#^StartupNotify=#a StartupWMClass=subl3' 'sublime_text_3/sublime_text.desktop'
-
+	# Install desktop entry and executable
 	install -dm755 "${pkgdir}/usr/share/applications"
 	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"
+	install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/subl3"
 }
diff --git a/sublime-text-3.sh b/sublime-text-3.sh
new file mode 100644
index 000000000000..5d228a493cc1
--- /dev/null
+++ b/sublime-text-3.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @ST_PATH@/sublime_text "$@"