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

[Filipe Laíns]

    Date: Sunday, November 10, 2019 @ 18:44:20
  Author: ffy00
Revision: 526483

upgpkg: code 1.40.0-3

Modified:
  code/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-10 18:25:06 UTC (rev 526482)
+++ PKGBUILD	2019-11-10 18:44:20 UTC (rev 526483)
@@ -11,7 +11,7 @@
 # Important: Remember to check https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) for target electron version
 _electron=electron6
 pkgver=1.40.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
 license=('MIT')
@@ -19,7 +19,7 @@
 optdepends=('bash-completion: Bash completions'
             'zsh-completions: ZSH completitons')
 makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-dubnium')
-source=("$pkgname::git+https://github.com/Microsoft/vscode.git#tag=$pkgver"
+source=("$pkgname::git+$url.git#tag=$pkgver"
         'code.js'
         'code.sh'
         'product_json.diff'
@@ -83,12 +83,14 @@
           s|@@URLPROTOCOL@@|vscode|g
           s|inode/directory;||' resources/linux/code{.appdata.xml,.desktop,-url-handler.desktop}
 
-  # Add missing exectable name to bash completion
-  sed -i 's|complete -F _code code|complete -F _code code code-oss|' resources/completions/bash/code
-  # Create new zsh completion file for our binary
+  # Add completitions for code-oss
+  cp resources/completions/bash/code resources/completions/bash/code-oss
   cp resources/completions/zsh/_code resources/completions/zsh/_code-oss
-  sed -i 's|#compdef code|#compdef code code-oss|' resources/completions/zsh/_code-oss
 
+  # Patch completitions with correct names
+  sed -i 's|@@APPNAME@@|code|g' resources/completions/{bash/code,zsh/_code}
+  sed -i 's|@@APPNAME@@|code-oss|g' resources/completions/{bash/code-oss,zsh/_code-oss}
+
   # Fix bin path
   sed -i "s|return path.join(path.dirname(execPath), 'bin', \`\${product.applicationName}\`);|return '/usr/bin/code';|g
           s|return path.join(appRoot, 'scripts', 'code-cli.sh');|return '/usr/bin/code';|g" \
@@ -108,7 +110,7 @@
   # The default memory limit may be too low for current versions of node
   # to successfully build vscode. Change it if this number still doesn't
   # work for your system.
-  mem_limit="--max_old_space_size=4096"
+  mem_limit="--max_old_space_size=6144"
 
   if ! /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-$_vscode_arch-min
   then
@@ -141,8 +143,9 @@
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/code-oss.png
 
   # Install bash and zsh completions
-  install -Dm 644 $pkgname/resources/completions/bash/code "$pkgdir"/usr/share/bash-completion/completions/code-oss
-  ln -s code-oss "$pkgdir"/usr/share/bash-completion/completions/code
+  install -Dm 644 $pkgname/resources/completions/bash/code "$pkgdir"/usr/share/bash-completion/completions/code
+  install -Dm 644 $pkgname/resources/completions/bash/code-oss "$pkgdir"/usr/share/bash-completion/completions/code-oss
+  install -Dm 644 $pkgname/resources/completions/zsh/_code "$pkgdir"/usr/share/zsh/site-functions/_code
   install -Dm 644 $pkgname/resources/completions/zsh/_code-oss "$pkgdir"/usr/share/zsh/site-functions/_code-oss
 
   # Install license files
@@ -149,3 +152,4 @@
   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
 }
+