Skip to content

Commit a4e350f

Browse files
joaomorenojoaomoreno
committed
Merge commit 'refs/pull/66181/head' of github.com:microsoft/vscode into pr/66181
2 parents 0e59bcb + a0a5c9c commit a4e350f

5 files changed

Lines changed: 29 additions & 20 deletions

File tree

‎build/gulpfile.vscode.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
365365
.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
366366
.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
367367

368-
// result = es.merge(result, gulp.src('resources/completions/**', { base: '.' }));
368+
result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
369+
.pipe(replace('@@APPNAME@@', product.applicationName))
370+
.pipe(rename(function (f) { f.basename = product.applicationName; })));
371+
result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
372+
.pipe(replace('@@APPNAME@@', product.applicationName))
373+
.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
369374

370375
if (platform === 'win32') {
371376
result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));

‎build/gulpfile.vscode.linux.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ function prepareDebPackage(arch) {
5454
const icon = gulp.src('resources/linux/code.png', { base: '.' })
5555
.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
5656

57-
// const bash_completion = gulp.src('resources/completions/bash/code')
58-
// .pipe(rename('usr/share/bash-completion/completions/code'));
57+
const bash_completion = gulp.src('resources/completions/bash/code')
58+
.pipe(replace('@@APPNAME@@', product.applicationName))
59+
.pipe(rename('usr/share/bash-completion/completions/' + product.applicationName));
5960

60-
// const zsh_completion = gulp.src('resources/completions/zsh/_code')
61-
// .pipe(rename('usr/share/zsh/vendor-completions/_code'));
61+
const zsh_completion = gulp.src('resources/completions/zsh/_code')
62+
.pipe(replace('@@APPNAME@@', product.applicationName))
63+
.pipe(rename('usr/share/zsh/vendor-completions/_' + product.applicationName));
6264

6365
const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
6466
.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -94,7 +96,7 @@ function prepareDebPackage(arch) {
9496
.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
9597
.pipe(rename('DEBIAN/postinst'));
9698

97-
const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, /* bash_completion, zsh_completion, */ code);
99+
const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, bash_completion, zsh_completion, code);
98100

99101
return all.pipe(vfs.dest(destination));
100102
};
@@ -144,11 +146,13 @@ function prepareRpmPackage(arch) {
144146
const icon = gulp.src('resources/linux/code.png', { base: '.' })
145147
.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));
146148

147-
// const bash_completion = gulp.src('resources/completions/bash/code')
148-
// .pipe(rename('BUILD/usr/share/bash-completion/completions/code'));
149+
const bash_completion = gulp.src('resources/completions/bash/code')
150+
.pipe(replace('@@APPNAME@@', product.applicationName))
151+
.pipe(rename('BUILD/usr/share/bash-completion/completions/' + product.applicationName));
149152

150-
// const zsh_completion = gulp.src('resources/completions/zsh/_code')
151-
// .pipe(rename('BUILD/usr/share/zsh/site-functions/_code'));
153+
const zsh_completion = gulp.src('resources/completions/zsh/_code')
154+
.pipe(replace('@@APPNAME@@', product.applicationName))
155+
.pipe(rename('BUILD/usr/share/zsh/site-functions/_' + product.applicationName));
152156

153157
const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
154158
.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -171,7 +175,7 @@ function prepareRpmPackage(arch) {
171175
const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
172176
.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));
173177

174-
const all = es.merge(code, desktops, appdata, icon, /* bash_completion, zsh_completion, */ spec, specIcon);
178+
const all = es.merge(code, desktops, appdata, icon, bash_completion, zsh_completion, spec, specIcon);
175179

176180
return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
177181
};

‎resources/completions/bash/code‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_code()
1+
_@@APPNAME@@()
22
{
33
local cur prev words cword split
44
_init_completion -s || return
@@ -58,4 +58,4 @@ _code()
5858

5959
_filedir
6060
} &&
61-
complete -F _code code
61+
complete -F _@@APPNAME@@ @@APPNAME@@

‎resources/completions/zsh/_code‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#compdef code
1+
#compdef @@APPNAME@@
22

33
local arguments
44

‎resources/linux/rpm/code.spec.template‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Visual Studio Code is a new choice of tool that combines the simplicity of a cod
1818
mkdir -p %{buildroot}/usr/share/@@NAME@@
1919
mkdir -p %{buildroot}/usr/share/applications
2020
mkdir -p %{buildroot}/usr/share/pixmaps
21-
#mkdir -p %{buildroot}/usr/share/bash-completion/completions
22-
#mkdir -p %{buildroot}/usr/share/zsh/site-functions
21+
mkdir -p %{buildroot}/usr/share/bash-completion/completions
22+
mkdir -p %{buildroot}/usr/share/zsh/site-functions
2323
cp -r usr/share/@@NAME@@/* %{buildroot}/usr/share/@@NAME@@
2424
cp -r usr/share/applications/@@NAME@@.desktop %{buildroot}/usr/share/applications
2525
cp -r usr/share/applications/@@NAME@@-url-handler.desktop %{buildroot}/usr/share/applications
2626
cp -r usr/share/pixmaps/@@ICON@@.png %{buildroot}/usr/share/pixmaps
27-
#cp usr/share/bash-completion/completions/code %{buildroot}/usr/share/bash-completion/completions/code
28-
#cp usr/share/zsh/site-functions/_code %{buildroot}/usr/share/zsh/site-functions/_code
27+
cp usr/share/bash-completion/completions/@@NAME@@ %{buildroot}/usr/share/bash-completion/completions/@@NAME@@
28+
cp usr/share/zsh/site-functions/_@@NAME@@ %{buildroot}/usr/share/zsh/site-functions/_@@NAME@@
2929

3030
%post
3131
# Remove the legacy bin command if this is the stable build
@@ -58,5 +58,5 @@ fi
5858
/usr/share/applications/@@NAME@@.desktop
5959
/usr/share/applications/@@NAME@@-url-handler.desktop
6060
/usr/share/pixmaps/@@ICON@@.png
61-
#/usr/share/bash-completion/completions/code
62-
#/usr/share/zsh/site-functions/_code
61+
/usr/share/bash-completion/completions/@@NAME@@
62+
/usr/share/zsh/site-functions/_@@NAME@@

0 commit comments

Comments
 (0)