Skip to content

Commit

Permalink
Use serverDataFolderName in check-requirements-linux.sh (#208074)
Browse files Browse the repository at this point in the history
* Use serverDataFolderName in check-requirements-linux.sh

* remove the (new) file check
  • Loading branch information
aeschli authored Mar 23, 2024
1 parent 28fecb9 commit 57b0c14
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion build/gulpfile.reh.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
} else if (platform === 'linux' || platform === 'alpine') {
result = es.merge(result,
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(util.setExecutableBit())
);
Expand Down
10 changes: 0 additions & 10 deletions resources/server/bin/helpers/check-requirements-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,12 @@ set -e
# Provides a way to skip the server requirements check from
# outside the install flow. A system process can create this
# 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
echo "!!! WARNING: Skipping server pre-requisite check !!!"
echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
exit 0
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)
found_required_glibc=0
found_required_glibcxx=0
Expand Down

0 comments on commit 57b0c14

Please sign in to comment.