From c1cec366fbf09ca355344a208887702728994f4f Mon Sep 17 00:00:00 2001 From: lencx Date: Thu, 5 Jan 2023 11:53:29 +0800 Subject: [PATCH 1/2] readme --- README-ZH_CN.md | 3 --- README.md | 3 --- 2 files changed, 6 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index fe1f0d7..1787d96 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -34,14 +34,11 @@ - 如果你偏爱 `.app` 的安装包，你同样可以在我们的 github releases 里找到 [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) - Homebrew \ _[Homebrew 快捷安装](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ - ```sh brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git brew install --cask chatgpt --no-quarantine ``` - 如果你坚持使用 _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_ ，你需要添加以下配置: - ```rb repo = "lencx/chatgpt" tap repo, "https://github.com/#{repo}.git" diff --git a/README.md b/README.md index e184ecb..d17a6e8 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,11 @@ - if you prefer `.app` installation, you can also download it from our github releases: [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) - Homebrew \ Or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ - ```sh brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git brew install --cask chatgpt --no-quarantine ``` - Also, if you keep a _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_, you can add something like this: - ```rb repo = "lencx/chatgpt" tap repo, "https://github.com/#{repo}.git" From f812d5ab04a20ceef8b56597db94aa2789a0e762 Mon Sep 17 00:00:00 2001 From: lencx Date: Thu, 5 Jan 2023 12:24:02 +0800 Subject: [PATCH 2/2] readme --- README-ZH_CN.md | 3 ++- README.md | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 1787d96..a3486a4 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -26,7 +26,8 @@ - 或者使用 [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/): - `winget install --id=lencx.ChatGPT -e` - `winget install --id=lencx.ChatGPT -e --version 0.7.4` -- 我们收到[报告](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) 称另一个 [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) 也可以通过 `winget`安装，并且与我们的程序有相同的默认安装路径，这无疑会引发冲突。 + +**注意：如果安装路径和应用名称相同，会导致冲突 ([#142](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972))** ### Mac diff --git a/README.md b/README.md index d17a6e8..ccbc88a 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,17 @@ ### Windows -- from our github releases: [ChatGPT_0.7.4_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64_en-US.msi) -- or install with [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/): +- From our github releases: [ChatGPT_0.7.4_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64_en-US.msi) +- Or install with [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/): - `winget install --id=lencx.ChatGPT -e` - `winget install --id=lencx.ChatGPT -e --version 0.7.4` -- we have just received a [report](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) that another [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) is also avaliable on `winget` and has the same default installation path, which may cause conflicts. + +**Note: If the installation path and application name are the same, it will lead to conflict ([#142](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972))** ### Mac -- from our github releases: [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) -- if you prefer `.app` installation, you can also download it from our github releases: [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) +- From our github releases: [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) +- If you prefer `.app` installation, you can also download it from our github releases: [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) - Homebrew \ Or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ ```sh