From c184c5170e50cfe71c0daa8cf36155037933c7cd Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 6 Apr 2022 11:12:51 -0700 Subject: [PATCH 1/4] chore: remove file ext. from LICENSE --- LICENSE.txt => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From baa47b68e63e6c885865b30397e984c5a8c34117 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 6 Apr 2022 15:36:18 -0700 Subject: [PATCH 2/4] fixup!: update LICENSE in missing places --- ci/build/build-release.sh | 4 ++-- patches/display-language.diff | 2 +- patches/store-socket.diff | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index e876f1268425..07a879c28441 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -24,7 +24,7 @@ main() { bundle_vscode rsync ./docs/README.md "$RELEASE_PATH" - rsync LICENSE.txt "$RELEASE_PATH" + rsync LICENSE "$RELEASE_PATH" rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH" } @@ -113,7 +113,7 @@ bundle_vscode() { "applicationName": "code-server", "dataFolderName": ".code-server", "win32MutexName": "codeserver", - "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE.txt", + "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE", "win32DirName": "code-server", "win32NameVersion": "code-server", "win32AppUserModelId": "coder.code-server", diff --git a/patches/display-language.diff b/patches/display-language.diff index 6bfc0c75d969..5b540e583ea9 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -222,7 +222,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/localizations/browser/lo @@ -0,0 +1,28 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Coder Technologies. All rights reserved. -+ * Licensed under the MIT License. See License.txt in the project root for license information. ++ * Licensed under the MIT License. See LICENSE in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; diff --git a/patches/store-socket.diff b/patches/store-socket.diff index 2bc60652c61a..2f1b02428616 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService. +++ code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts @@ -2,7 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Licensed under the MIT License. See LICENSE in the project root for license information. *--------------------------------------------------------------------------------------------*/ - +import { promises as fs } from 'fs'; From 0c003d54e5ff506c1c1d3251ab681e32f6bd30ae Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 7 Apr 2022 08:31:47 -0700 Subject: [PATCH 3/4] Revert "fixup!: update LICENSE in missing places" This reverts commit baa47b68e63e6c885865b30397e984c5a8c34117. --- ci/build/build-release.sh | 4 ++-- patches/display-language.diff | 2 +- patches/store-socket.diff | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 07a879c28441..e876f1268425 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -24,7 +24,7 @@ main() { bundle_vscode rsync ./docs/README.md "$RELEASE_PATH" - rsync LICENSE "$RELEASE_PATH" + rsync LICENSE.txt "$RELEASE_PATH" rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH" } @@ -113,7 +113,7 @@ bundle_vscode() { "applicationName": "code-server", "dataFolderName": ".code-server", "win32MutexName": "codeserver", - "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE", + "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE.txt", "win32DirName": "code-server", "win32NameVersion": "code-server", "win32AppUserModelId": "coder.code-server", diff --git a/patches/display-language.diff b/patches/display-language.diff index 5b540e583ea9..6bfc0c75d969 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -222,7 +222,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/localizations/browser/lo @@ -0,0 +1,28 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Coder Technologies. All rights reserved. -+ * Licensed under the MIT License. See LICENSE in the project root for license information. ++ * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; diff --git a/patches/store-socket.diff b/patches/store-socket.diff index 2f1b02428616..2bc60652c61a 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService. +++ code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts @@ -2,7 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See LICENSE in the project root for license information. + * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - +import { promises as fs } from 'fs'; From b996c3214aee4ec7a0b50e74d0427c24012d206f Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 7 Apr 2022 08:32:28 -0700 Subject: [PATCH 4/4] fixup!: update LICENSE in build-release --- ci/build/build-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index e876f1268425..07a879c28441 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -24,7 +24,7 @@ main() { bundle_vscode rsync ./docs/README.md "$RELEASE_PATH" - rsync LICENSE.txt "$RELEASE_PATH" + rsync LICENSE "$RELEASE_PATH" rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH" } @@ -113,7 +113,7 @@ bundle_vscode() { "applicationName": "code-server", "dataFolderName": ".code-server", "win32MutexName": "codeserver", - "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE.txt", + "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE", "win32DirName": "code-server", "win32NameVersion": "code-server", "win32AppUserModelId": "coder.code-server",