Skip to content

Commit 57b0c14

Browse files
authored
Use serverDataFolderName in check-requirements-linux.sh (microsoft#208074)
* Use serverDataFolderName in check-requirements-linux.sh * remove the (new) file check
1 parent 28fecb9 commit 57b0c14

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

build/gulpfile.reh.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
382382
} else if (platform === 'linux' || platform === 'alpine') {
383383
result = es.merge(result,
384384
gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
385-
.pipe(replace('@@SERVER_APPLICATION_NAME@@', product.serverApplicationName))
386385
.pipe(rename(`bin/helpers/check-requirements.sh`))
387386
.pipe(util.setExecutableBit())
388387
);

resources/server/bin/helpers/check-requirements-linux.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,12 @@ set -e
1818
# Provides a way to skip the server requirements check from
1919
# outside the install flow. A system process can create this
2020
# file before the server is downloaded and installed.
21-
#
22-
# This check is duplicated between code-server-linux.sh and here
23-
# since remote container calls into this script directly quite early
24-
# before the usual server startup flow.
2521
if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
2622
echo "!!! WARNING: Skipping server pre-requisite check !!!"
2723
echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
2824
exit 0
2925
fi
3026

31-
# Default to legacy server if the following file is present.
32-
if [ -f "$HOME/@@SERVER_APPLICATION_NAME@@-use-legacy" ]; then
33-
echo "!!! WARNING: Using legacy server due to the presence of $HOME/@@SERVER_APPLICATION_NAME@@-use-legacy !!!"
34-
exit 100
35-
fi
36-
3727
ARCH=$(uname -m)
3828
found_required_glibc=0
3929
found_required_glibcxx=0

0 commit comments

Comments
 (0)