development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use serverDataFolderName in check-requirements-linux.sh (#208074)

Browse source 
* Use serverDataFolderName in check-requirements-linux.sh

* remove the (new) file check
This commit is contained in:
Martin Aeschlimann 2024-03-23 02:10:17 +01:00 committed by GitHub
parent 28fecb9490
commit 57b0c146d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/gulpfile.reh.js
View file

@ -382,7 +382,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
} else if (platform === 'linux' || platform === 'alpine') { } else if (platform === 'linux' || platform === 'alpine') {
result = es.merge(result, result = es.merge(result,
gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' }) gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
.pipe(replace('@@SERVER_APPLICATION_NAME@@', product.serverApplicationName))
.pipe(rename(`bin/helpers/check-requirements.sh`)) .pipe(rename(`bin/helpers/check-requirements.sh`))
.pipe(util.setExecutableBit()) .pipe(util.setExecutableBit())
); );

10
resources/server/bin/helpers/check-requirements-linux.sh
View file

@ -18,22 +18,12 @@ set -e
# Provides a way to skip the server requirements check from # Provides a way to skip the server requirements check from
# outside the install flow. A system process can create this # outside the install flow. A system process can create this
# file before the server is downloaded and installed. # file before the server is downloaded and installed.
#
# This check is duplicated between code-server-linux.sh and here
# since remote container calls into this script directly quite early
# before the usual server startup flow.
if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
echo "!!! WARNING: Skipping server pre-requisite check !!!" echo "!!! WARNING: Skipping server pre-requisite check !!!"
echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!" echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
exit 0 exit 0
fi fi
# Default to legacy server if the following file is present.
if [ -f "$HOME/@@SERVER_APPLICATION_NAME@@-use-legacy" ]; then
echo "!!! WARNING: Using legacy server due to the presence of $HOME/@@SERVER_APPLICATION_NAME@@-use-legacy !!!"
exit 100
fi
ARCH=$(uname -m) ARCH=$(uname -m)
found_required_glibc=0 found_required_glibc=0
found_required_glibcxx=0 found_required_glibcxx=0