[arch-commits] Commit in code/trunk (PKGBUILD code.js code.sh)

[Filipe Laíns]

    Date: Tuesday, September 11, 2018 @ 01:59:52
  Author: ffy00
Revision: 379428

upgpkg: code 1.27.1-4

Fix bug where the app would always start in the electron app folder.

Added:
  code/trunk/code.js
Modified:
  code/trunk/PKGBUILD
  code/trunk/code.sh

----------+
 PKGBUILD |   19 +++++++++++--------
 code.js  |   11 +++++++++++
 code.sh  |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-11 00:53:35 UTC (rev 379427)
+++ PKGBUILD	2018-09-11 01:59:52 UTC (rev 379428)
@@ -6,7 +6,7 @@
 pkgname=code
 pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
 pkgver=1.27.1
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://github.com/Microsoft/vscode'
 license=('MIT')
@@ -14,10 +14,12 @@
 makedepends=('git' 'gulp' 'npm' 'python2' 'yarn')
 source=("$pkgname::git+https://github.com/Microsoft/vscode#tag=$_pkgver"
         'code.sh'
+        'code.js'
         'product_json.patch'
         'code-liveshare.patch')
 sha512sums=('SKIP'
-            'dfca36cf30eeab786c38feb320dcec09764dcaa912d9587a959ce5a4273f6a4af7de3a01b963beedc1ec64782b459aa8491d9b808b9c6ce98f847e80d618d272'
+            '75c1052700eeee80ed28d556b801c5f9d096cc7b0638d331cb8ca4814d9dcb436c2b1aa8772bf6d137503c2f13c3796ce7fe4b9ae83034831cb61bc36474e6ec'
+            '3d58a4e26767d2a29ff36f6cb41f9ca3c5a3f2608450917bc45db8901fc2b18f38b01e9725c7c381617d284eaaaeb969f531b96bcc48f839bda61bbc36cf6e68'
             'dcf52fa373a787cd94ce7ad216a269de3ca90b3f02cea1d635016d980e765a9cc040776ce4b4ef83721ab6f0d74efb7a3a9ca02fbdf3daa06653c766d36cde08'
             '6080b9d30b2c852a831d4fa98be94e42eb7d94dfd5813bbe28410d031191c20563e4288d6b0062c74b635a962c3eba3533fcebeff1f67b4a8005a167c2f7fbf2')
 
@@ -87,15 +89,16 @@
   cp -r --no-preserve=ownership --preserve=mode VSCode-linux-$_vscode_arch/resources/* "$pkgdir"/usr/lib/$pkgname/
 
   # Install binary
+  install -Dm 755 code.js "$pkgdir"/usr/lib/$pkgname/code.js
   install -Dm 755 code.sh "$pkgdir"/usr/bin/code
 
   # Install appdata and desktop file
   sed -i 's|/usr/share/@@NAME@@/@@NAME@@|@@NAME@@|g
-          s/@@NAME_SHORT@@/Code - OSS/g
-          s/@@NAME_LONG@@/Code/g
-          s/@@NAME@@/code/g
-          s/@@ICON@@/code/g
-          s/@@LICENSE@@/MIT/g' code/resources/linux/code.{appdata.xml,desktop}
+          s|@@NAME_SHORT@@|Code - OSS|g
+          s|@@NAME_LONG@@|Code|g
+          s|@@NAME@@|code|g
+          s|@@ICON@@|code|g
+          s|@@LICENSE@@|MIT|g' code/resources/linux/code.{appdata.xml,desktop}
 
   install -Dm 644 code/resources/linux/code.appdata.xml "$pkgdir"/usr/share/metainfo/code.appdata.xml
   install -Dm 644 code/resources/linux/code.desktop "$pkgdir"/usr/share/applications/code.desktop
@@ -102,7 +105,7 @@
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/code.png
 
   # Install license files
-  install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt "$pkgdir"/usr/share/licenses/$pkgname/ThirdPartyNotices.txt
 }
 

Added: code.js
===================================================================
--- code.js	                        (rev 0)
+++ code.js	2018-09-11 01:59:52 UTC (rev 379428)
@@ -0,0 +1,11 @@
+#!/usr/bin/electron
+
+const {app} = require('electron');
+const path = require('path');
+
+// Remove first command line argument (/usr/bin/electron).
+process.argv.splice(0, 1);
+
+// Run the application.
+require('module')._load(__dirname, module, true);
+

Modified: code.sh
===================================================================
--- code.sh	2018-09-11 00:53:35 UTC (rev 379427)
+++ code.sh	2018-09-11 01:59:52 UTC (rev 379428)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-electron /usr/lib/code/app/ "$@"
+electron /usr/lib/code/app/code.js "$@"