a
/
code-server-2
mirror of https://git.tuxpa.in/a/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Override existing asar symlink in postinstall (#3369) 

This ensures the link is correct. Should fix #3355.
This commit is contained in:
Asher 2021-05-12 16:46:29 -05:00 committed by GitHub
parent 8f82d6e8b9
commit e64fd451b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -63,6 +63,7 @@ VS Code v1.56
### Bug Fixes ### Bug Fixes
- fix: Check the logged user instead of $USER #3330 @videlanicolas - fix: Check the logged user instead of $USER #3330 @videlanicolas
- fix: Fix broken node_modules.asar symlink in npm package #3355 @code-asher
### Documentation ### Documentation

15
ci/build/npm-postinstall.sh
View File

@ -56,18 +56,21 @@ main() {
fi fi
} }
vscode_yarn() {
cd lib/vscode
yarn --production --frozen-lockfile
# This is a copy of symlink_asar in ../lib.sh. Look there for details. # This is a copy of symlink_asar in ../lib.sh. Look there for details.
if [ ! -e node_modules.asar ]; then symlink_asar() {
rm -f node_modules.asar
if [ "${WINDIR-}" ]; then if [ "${WINDIR-}" ]; then
mklink /J node_modules.asar node_modules mklink /J node_modules.asar node_modules
else else
ln -s node_modules node_modules.asar ln -s node_modules node_modules.asar
fi fi
fi }
vscode_yarn() {
cd lib/vscode
yarn --production --frozen-lockfile
symlink_asar
cd extensions cd extensions
yarn --production --frozen-lockfile yarn --production --frozen-lockfile

3
ci/lib.sh
View File

@ -112,7 +112,7 @@ RELEASE_PATH="${RELEASE_PATH-release}"
# Code itself but also extensions will look specifically in this directory for # Code itself but also extensions will look specifically in this directory for
# files (like the ripgrep binary or the oniguruma wasm). # files (like the ripgrep binary or the oniguruma wasm).
symlink_asar() { symlink_asar() {
if [ ! -L node_modules.asar ]; then rm -f node_modules.asar
if [ "${WINDIR-}" ]; then if [ "${WINDIR-}" ]; then
# mklink takes the link name first. # mklink takes the link name first.
mklink /J node_modules.asar node_modules mklink /J node_modules.asar node_modules
@ -120,5 +120,4 @@ symlink_asar() {
# ln takes the link name second. # ln takes the link name second.
ln -s node_modules node_modules.asar ln -s node_modules node_modules.asar
fi fi
fi
} }