From 3664544e77b57e1ddd6195e566d6ce18984d63d5 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 11 Sep 2022 13:08:41 +0200 Subject: [PATCH 1/5] fix: replace publisher's name (#1246) --- get_repo.sh | 8 ++++---- prepare_vscode.sh | 19 ++++++++++++++++--- .../win32/VisualElementsManifest.xml | 9 +++++++++ .../win32/VisualElementsManifest.xml | 9 +++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 src/insider/resources/win32/VisualElementsManifest.xml create mode 100644 src/stable/resources/win32/VisualElementsManifest.xml diff --git a/get_repo.sh b/get_repo.sh index b99c9ef..bbf03ac 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -10,13 +10,13 @@ fi if [[ -z "${RELEASE_VERSION}" ]]; then if [[ "${VSCODE_QUALITY}" == "insider" ]]; then if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "insider.json" ]]; then - UPDATE_INFO=$( curl https://update.code.visualstudio.com/api/update/darwin/insider/lol ) + UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/insider/lol ) else export MS_COMMIT=$(jq -r '.commit' insider.json) export MS_TAG=$(jq -r '.tag' insider.json) fi else - UPDATE_INFO=$( curl https://update.code.visualstudio.com/api/update/darwin/stable/lol ) + UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/stable/lol ) fi if [[ -z "${MS_COMMIT}" ]]; then @@ -73,9 +73,9 @@ git remote add origin https://github.com/Microsoft/vscode.git # figure out latest tag by calling MS update API if [[ -z "${MS_TAG}" ]]; then if [[ "${VSCODE_QUALITY}" == "insider" ]]; then - UPDATE_INFO=$( curl https://update.code.visualstudio.com/api/update/darwin/insider/lol ) + UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/insider/lol ) else - UPDATE_INFO=$( curl https://update.code.visualstudio.com/api/update/darwin/stable/lol ) + UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/stable/lol ) fi export MS_COMMIT=$( echo "${UPDATE_INFO}" | jq -r '.version' ) export MS_TAG=$( echo "${UPDATE_INFO}" | jq -r '.name' ) diff --git a/prepare_vscode.sh b/prepare_vscode.sh index c817cf5..c653028 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -71,8 +71,6 @@ else CHILD_CONCURRENCY=1 yarn --frozen-lockfile fi -cp product.json product.json.bak - setpath() { { set +x; } 2>/dev/null echo "$( cat "${1}.json" | jq --arg 'path' "${2}" --arg 'value' "${3}" 'setpath([$path]; $value)' )" > "${1}.json" @@ -85,7 +83,9 @@ setpath_json() { set -x } -# set fields in product.json +# product.json +cp product.json product.json.bak + setpath "product" "checksumFailMoreInfoUrl" "https://go.microsoft.com/fwlink/?LinkId=828886" setpath "product" "documentationUrl" "https://go.microsoft.com/fwlink/?LinkID=533484#vscode" setpath_json "product" "extensionsGallery" '{"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item"}' @@ -153,12 +153,21 @@ echo "$( jq -s '.[0] * .[1]' product.json ../product.json )" > product.json cat product.json +# package.json cp package.json package.json.bak + setpath "package" "version" $( echo "${RELEASE_VERSION}" | sed -n -E "s/^(.*)\.([0-9]+)(-insider)?$/\1/p" ) setpath "package" "release" $( echo "${RELEASE_VERSION}" | sed -n -E "s/^(.*)\.([0-9]+)(-insider)?$/\2/p" ) +replace 's|Microsoft Corporation|VSCodium|' package.json + ../undo_telemetry.sh +replace 's|Microsoft Corporation|VSCodium|' build/lib/electron.js +replace 's|Microsoft Corporation|VSCodium|' build/lib/electron.ts +replace 's|([0-9]) Microsoft|\1 VSCodium|' build/lib/electron.js +replace 's|([0-9]) Microsoft|\1 VSCodium|' build/lib/electron.ts + if [[ "${OS_NAME}" == "linux" ]]; then # microsoft adds their apt repo to sources # unless the app name is code-oss @@ -192,6 +201,10 @@ if [[ "${OS_NAME}" == "linux" ]]; then # snapcraft.yaml sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template +elif [[ "${OS_NAME}" == "windows" ]]; then + # code.iss + sed -i 's|https://code.visualstudio.com|https://vscodium.com|' build/win32/code.iss + sed -i 's|Microsoft Corporation|VSCodium|' build/win32/code.iss fi cd .. diff --git a/src/insider/resources/win32/VisualElementsManifest.xml b/src/insider/resources/win32/VisualElementsManifest.xml new file mode 100644 index 0000000..214861c --- /dev/null +++ b/src/insider/resources/win32/VisualElementsManifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/stable/resources/win32/VisualElementsManifest.xml b/src/stable/resources/win32/VisualElementsManifest.xml new file mode 100644 index 0000000..7e4d6dc --- /dev/null +++ b/src/stable/resources/win32/VisualElementsManifest.xml @@ -0,0 +1,9 @@ + + + From a64611cedad5572099d7bc153dec6d8460831f53 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 4 Sep 2022 20:50:32 +0200 Subject: [PATCH 2/5] ci: use not deprecated macOS (#1235) --- .github/workflows/insider-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 026a102..9737365 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: include: - - runner: macOS-10.15 + - runner: macos-12 vscode_arch: x64 - runner: [self-hosted, macOS, ARM64] vscode_arch: arm64 From 397b37f54c2cbf488a4aafa217a95c5764d64296 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 13 Sep 2022 22:23:52 +0200 Subject: [PATCH 3/5] fix(linux): correctly resolve url to get pkg2appimage (#1249) --- build/linux/appimage/build.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/linux/appimage/build.sh b/build/linux/appimage/build.sh index 90e2776..6347a6f 100755 --- a/build/linux/appimage/build.sh +++ b/build/linux/appimage/build.sh @@ -7,7 +7,16 @@ CALLER_DIR=$( pwd ) cd "$( dirname "${BASH_SOURCE[0]}" )" if [[ "${VSCODE_ARCH}" == "x64" ]]; then - wget -c https://github.com/$(wget -q https://github.com/AppImage/pkg2appimage/releases -O - | grep "pkg2appimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) + GITHUB_RESPONSE=$( curl -s "https://api.github.com/repos/AppImage/pkg2appimage/releases/latest" ) + APPIMAGE_URL=$( echo "${GITHUB_RESPONSE}" | jq --raw-output '.assets | map(select( .name | test("x86_64.AppImage(?!.zsync)"))) | map(.browser_download_url)[0]' ) + + if [[ -z "${APPIMAGE_URL}" ]]; then + echo "The url for pkg2appimage.AppImage hasn't been found" + exit 1 + fi + + wget -c "${APPIMAGE_URL}" + chmod +x ./pkg2appimage-*.AppImage ./pkg2appimage-*.AppImage --appimage-extract && mv ./squashfs-root ./pkg2appimage.AppDir From e70f1391b22e48b5b29e3512d97e801f4bdf83e5 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 14 Sep 2022 00:00:52 +0200 Subject: [PATCH 4/5] fix(ci): use macos 12 runner --- .github/workflows/stable-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index eb405eb..670e795 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: include: - - runner: macOS-10.15 + - runner: macos-12 vscode_arch: x64 - runner: [self-hosted, macOS, ARM64] vscode_arch: arm64 From b36705ca7f35158d34051eb6a461fc94c1772b56 Mon Sep 17 00:00:00 2001 From: Vik <63919734+ViktorOn@users.noreply.github.com> Date: Fri, 16 Sep 2022 15:27:17 +0300 Subject: [PATCH 5/5] feat(msi): add russian translation (#1255) --- build/windows/msi/i18n/vscodium.ru-ru.wxl | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build/windows/msi/i18n/vscodium.ru-ru.wxl b/build/windows/msi/i18n/vscodium.ru-ru.wxl index 6e3dcf4..e31d2dd 100644 --- a/build/windows/msi/i18n/vscodium.ru-ru.wxl +++ b/build/windows/msi/i18n/vscodium.ru-ru.wxl @@ -1,25 +1,25 @@ - + 1049 @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with @@PRODUCT_NAME@@ - Start Menu shortcut - Create a start menu icon. - Desktop shortcut - Create a desktop icon. - File Associations - Register @@PRODUCT_NAME@@ as an editor for supported file types. - Files context menu - Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. - Directory context menu - Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. - Add to PATH - Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. - Launch @@PRODUCT_NAME@@ - Newer version of @@PRODUCT_NAME@@ is already installed. - This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. - Windows 7 or later is required. + Пакет с @@PRODUCT_NAME@@ + Ярлык в меню «Пуск» + Создайте значок в меню «Пуск». + Ярлык рабочего стола + Создать значок на рабочем столе. + Ассоциации файлов + Зарегистрировать @@PRODUCT_NAME@@ в качестве редактора поддерживаемых типов файлов. + Контекстное меню файлов + Добавить действие «Открыть с помощью @@PRODUCT_NAME@@» в контекстное меню файлов Проводника Windows. + Контекстное меню каталога + Добавить действие «Открыть с помощью @@PRODUCT_NAME@@» в контекстное меню каталога Проводника Windows. + Добавить в PATH + Добавить @@PRODUCT_NAME@@ в переменную среды PATH. Доступно после перезапуска. + Запустить @@PRODUCT_NAME@@ + Новая версия @@PRODUCT_NAME@@ уже установлена. + Приложению требуется .NET Framework 4.5.2 или более новая версии. Пожалуйста, установите .NET Framework, затем снова запустите установщик. + Требуется Windows 7 или более новая версия.