patch .desktop files

9 files changed, 56 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcea6ef52ee1..5971ec0c1005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,28 @@
 pkgbase = code-icons
 	pkgdesc = Change Code OSS icons to VSCode ones
 	pkgver = 1.54.3
-	pkgrel = 1
+	pkgrel = 2
 	install = code-icons.install
 	arch = any
 	license = unknown
 	depends = code
+	depends = patch
 	source = code-icons.hook
 	source = patch.sh
 	source = visual-studio-code.png
 	source = letterpress.svg
 	source = letterpress-dark.svg
 	source = letterpress-hc.svg
-	md5sums = 4daa6413b80f92c531fd769515475b5c
-	md5sums = 3bcb7eee753afe0261d246a4323cda42
+	source = code-oss.desktop.diff
+	source = code-oss-url-handler.desktop.diff
+	md5sums = db22ba0eaa2e6388054bde382ac8a392
+	md5sums = d5e4161d61932d262c6327e30bf77527
 	md5sums = 04c4c453a76effa2d794fd6037fb1412
 	md5sums = fcae93243f3d0c408707711b833e408f
 	md5sums = 0c284b5816605c2c3fb9d24b88b759b9
 	md5sums = 0fb6c6b3251e012cee655ee300402029
+	md5sums = 4bd7610b6fd58a9e2b7d557889d69c0d
+	md5sums = b03d8553fc370566e860c9bf98a80dd6
 
 pkgname = code-icons
 
diff --git a/PKGBUILD b/PKGBUILD
index f4af569d0f68..3cf913e2c2b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,37 @@
 # Maintainer: coxackie
 pkgname=code-icons
 pkgver=1.54.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Change Code OSS icons to VSCode ones'
 arch=('any')
 license=('unknown')
-depends=('code')
+depends=('code' 'patch')
 install="${pkgname}.install"
 source=("${pkgname}.hook"
         'patch.sh'
         'visual-studio-code.png'
         'letterpress.svg'
         'letterpress-dark.svg'
-        'letterpress-hc.svg')
-md5sums=('4daa6413b80f92c531fd769515475b5c'
-         '3bcb7eee753afe0261d246a4323cda42'
+        'letterpress-hc.svg'
+        'code-oss.desktop.diff'
+        'code-oss-url-handler.desktop.diff')
+md5sums=('db22ba0eaa2e6388054bde382ac8a392'
+         'd5e4161d61932d262c6327e30bf77527'
          '04c4c453a76effa2d794fd6037fb1412'
          'fcae93243f3d0c408707711b833e408f'
          '0c284b5816605c2c3fb9d24b88b759b9'
-         '0fb6c6b3251e012cee655ee300402029')
+         '0fb6c6b3251e012cee655ee300402029'
+         '4bd7610b6fd58a9e2b7d557889d69c0d'
+         'b03d8553fc370566e860c9bf98a80dd6')
 
 
 package() {
   install -Dm 644 "${srcdir}/${pkgname}.hook" "${pkgdir}/usr/share/libalpm/hooks/${pkgname}.hook"
   install -Dm 755 "${srcdir}/patch.sh" "${pkgdir}/usr/share/${pkgname}/patch.sh"
-  install -Dm 755 "${srcdir}"/visual-studio-code.png "${pkgdir}"/usr/share/${pkgname}/visual-studio-code.png
-  install -Dm 755 "${srcdir}"/letterpress.svg "${pkgdir}"/usr/share/${pkgname}/letterpress.svg
-  install -Dm 755 "${srcdir}"/letterpress-dark.svg "${pkgdir}"/usr/share/${pkgname}/letterpress-dark.svg
-  install -Dm 755 "${srcdir}"/letterpress-hc.svg "${pkgdir}"/usr/share/${pkgname}/letterpress-hc.svg
+  install -Dm 644 "${srcdir}/visual-studio-code.png" "${pkgdir}/usr/share/${pkgname}/visual-studio-code.png"
+  install -Dm 644 "${srcdir}/letterpress.svg" "${pkgdir}/usr/share/${pkgname}/letterpress.svg"
+  install -Dm 644 "${srcdir}/letterpress-dark.svg" "${pkgdir}/usr/share/${pkgname}/letterpress-dark.svg"
+  install -Dm 644 "${srcdir}/letterpress-hc.svg" "${pkgdir}/usr/share/${pkgname}/letterpress-hc.svg"
+  install -Dm 644 "${srcdir}/code-oss.desktop.diff" "${pkgdir}/usr/share/${pkgname}/code-oss.desktop.diff"
+  install -Dm 644 "${srcdir}/code-oss-url-handler.desktop.diff" "${pkgdir}/usr/share/${pkgname}/code-oss-url-handler.desktop.diff"
 }
diff --git a/code-icons.hook b/code-icons.hook
index 59d2373e970e..a747cdd360f0 100644
--- a/code-icons.hook
+++ b/code-icons.hook
@@ -2,11 +2,7 @@
 Operation = Install
 Operation = Upgrade
 Type = Path
-Target = usr/share/pixmaps/com.visualstudio.code.oss.png
 Target = usr/lib/code/resources/linux/code.png
-Target = usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg
-Target = usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
-Target = usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
 
 [Action]
 Description = [code-icons] Changing to VS Code icons...
diff --git a/code-oss-url-handler.desktop.diff b/code-oss-url-handler.desktop.diff
new file mode 100644
index 000000000000..37002b11aae8
--- /dev/null
+++ b/code-oss-url-handler.desktop.diff
@@ -0,0 +1,11 @@
+--- code-oss-url-handler.desktop.old   2021-04-01 21:39:16.000000000 +0800
++++ code-oss-url-handler.desktop.new   2021-04-06 19:42:21.257125168 +0800
+@@ -3,7 +3,7 @@
+ Comment=Code Editing. Redefined.
+ GenericName=Text Editor
+ Exec=/usr/bin/code-oss --no-sandbox --open-url %U
+-Icon=com.visualstudio.code.oss
++Icon=visual-studio-code
+ Type=Application
+ NoDisplay=true
+ StartupNotify=true
diff --git a/code-oss.desktop.diff b/code-oss.desktop.diff
new file mode 100644
index 000000000000..353653b5cd11
--- /dev/null
+++ b/code-oss.desktop.diff
@@ -0,0 +1,17 @@
+--- code-oss.desktop.old   2021-04-06 19:39:45.153785672 +0800
++++ code-oss.desktop.new   2021-04-06 19:39:08.807117588 +0800
+@@ -3,7 +3,7 @@
+ Comment=Code Editing. Redefined.
+ GenericName=Text Editor
+ Exec=/usr/bin/code-oss --no-sandbox --unity-launch %F
+-Icon=com.visualstudio.code.oss
++Icon=visual-studio-code
+ Type=Application
+ StartupNotify=false
+ StartupWMClass=Code
+@@ -15,4 +15,4 @@
+ [Desktop Action new-empty-window]
+ Name=New Empty Window
+ Exec=/usr/bin/code-oss --no-sandbox --new-window %F
+-Icon=com.visualstudio.code.oss
++Icon=visual-studio-code
diff --git a/letterpress-dark.svg b/letterpress-dark.svg
index 19d4d7f558e6..19d4d7f558e6 100755..100644
--- a/letterpress-dark.svg
+++ b/letterpress-dark.svg
diff --git a/letterpress-hc.svg b/letterpress-hc.svg
index 2d5bf751d7d5..2d5bf751d7d5 100755..100644
--- a/letterpress-hc.svg
+++ b/letterpress-hc.svg
diff --git a/letterpress.svg b/letterpress.svg
index 325fb26c9963..325fb26c9963 100755..100644
--- a/letterpress.svg
+++ b/letterpress.svg
diff --git a/patch.sh b/patch.sh
index 088331c78f85..17647fc37ee3 100644..100755
--- a/patch.sh
+++ b/patch.sh
@@ -2,6 +2,10 @@
 
 if [ "${1}" = "-u" ]; then
   mv /usr/share/pixmaps/com.visualstudio.code.oss.png.bak /usr/share/pixmaps/com.visualstudio.code.oss.png && mv /usr/lib/code/resources/linux/code.png.bak /usr/lib/code/resources/linux/code.png && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg.bak /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg.bak /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg.bak /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
+  patch -R /usr/share/applications/code-oss.desktop </usr/share/code-icons/code-oss.desktop.diff
+  patch -R /usr/share/applications/code-oss-url-handler.desktop </usr/share/code-icons/code-oss-url-handler.desktop.diff
 else
   mv /usr/share/pixmaps/com.visualstudio.code.oss.png /usr/share/pixmaps/com.visualstudio.code.oss.png.bak && cp /usr/share/code-icons/visual-studio-code.png /usr/share/pixmaps/com.visualstudio.code.oss.png && mv /usr/lib/code/resources/linux/code.png /usr/lib/code/resources/linux/code.png.bak && cp /usr/share/code-icons/visual-studio-code.png /usr/lib/code/resources/linux/code.png && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg.bak && cp /usr/share/code-icons/letterpress.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress.svg && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg.bak && cp /usr/share/code-icons/letterpress-dark.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg && mv /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg.bak && cp /usr/share/code-icons/letterpress-hc.svg /usr/lib/code/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
+  patch /usr/share/applications/code-oss.desktop </usr/share/code-icons/code-oss.desktop.diff
+  patch /usr/share/applications/code-oss-url-handler.desktop </usr/share/code-icons/code-oss-url-handler.desktop.diff
 fi