1
0
mirror of https://github.com/lencx/ChatGPT.git synced 2024-10-01 01:06:13 -04:00

Merge branch 'lencx:main' into main

This commit is contained in:
tk 2023-01-05 12:36:51 +08:00 committed by GitHub
commit d657a6e262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions

View File

@ -26,7 +26,8 @@
- 或者使用 [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/): - 或者使用 [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/):
- `winget install --id=lencx.ChatGPT -e` - `winget install --id=lencx.ChatGPT -e`
- `winget install --id=lencx.ChatGPT -e --version 0.7.4` - `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 ### Mac
@ -34,14 +35,11 @@
- 如果你偏爱 `.app` 的安装包,你同样可以在我们的 github releases 里找到 [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) - 如果你偏爱 `.app` 的安装包,你同样可以在我们的 github releases 里找到 [ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz)
- Homebrew \ - Homebrew \
_[Homebrew 快捷安装](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ _[Homebrew 快捷安装](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_
```sh ```sh
brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git
brew install --cask chatgpt --no-quarantine brew install --cask chatgpt --no-quarantine
``` ```
如果你坚持使用 _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_ ,你需要添加以下配置: 如果你坚持使用 _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_ ,你需要添加以下配置:
```rb ```rb
repo = "lencx/chatgpt" repo = "lencx/chatgpt"
tap repo, "https://github.com/#{repo}.git" tap repo, "https://github.com/#{repo}.git"

View File

@ -25,26 +25,24 @@
### Windows ### 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) - 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/): - 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`
- `winget install --id=lencx.ChatGPT -e --version 0.7.4` - `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 ### 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) - 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) - 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 \ - Homebrew \
Or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ Or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_
```sh ```sh
brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git
brew install --cask chatgpt --no-quarantine 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: Also, if you keep a _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_, you can add something like this:
```rb ```rb
repo = "lencx/chatgpt" repo = "lencx/chatgpt"
tap repo, "https://github.com/#{repo}.git" tap repo, "https://github.com/#{repo}.git"