mirror of https://git.tuxpa.in/a/code-server.git
Merge pull request #2539 from cdr/callback-html
This commit is contained in:
commit
39faceeee4
|
@ -83,8 +83,9 @@ bundle_vscode() {
|
||||||
rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions"
|
rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions"
|
||||||
rsync "$VSCODE_SRC_PATH/extensions/postinstall.js" "$VSCODE_OUT_PATH/extensions"
|
rsync "$VSCODE_SRC_PATH/extensions/postinstall.js" "$VSCODE_OUT_PATH/extensions"
|
||||||
|
|
||||||
mkdir -p "$VSCODE_OUT_PATH/resources/linux"
|
mkdir -p "$VSCODE_OUT_PATH/resources/"{linux,web}
|
||||||
rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png"
|
rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png"
|
||||||
|
rsync "$VSCODE_SRC_PATH/resources/web/callback.html" "$VSCODE_OUT_PATH/resources/web/callback.html"
|
||||||
|
|
||||||
# Adds the commit and date to product.json
|
# Adds the commit and date to product.json
|
||||||
jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
|
jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
|
||||||
|
|
|
@ -103,7 +103,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 [ ! -e node_modules.asar ]; then
|
if [ ! -L node_modules.asar ]; then
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue