From 8689082c7b8f8a8ffb7e65016a874a4952b8a796 Mon Sep 17 00:00:00 2001 From: yixinBC Date: Thu, 5 Jan 2023 09:41:09 +0800 Subject: [PATCH 1/6] readme:install --- README.md | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index fbf4bfa..b9a8d96 100644 --- a/README.md +++ b/README.md @@ -15,38 +15,34 @@ -## 📦 Downloads +Buy Me A Coffee + +## 📦 Install [📝 Update Log](./UPDATE_LOG.md) -**Latest:** +### Windows -- `Mac`: [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) -- `Windows`: [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) -- `Linux`: - - [chat-gpt_0.7.4_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.deb) - - [chat-gpt_0.7.4_amd64.AppImage](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.AppImage): **works reliably, you can try it if `.deb` fails to run** +- 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. -[Other version...](https://github.com/lencx/ChatGPT/releases) +### Mac - - -Buy Me A Coffee - ---- - -### Install - -Easily install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ +- 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) +- 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: +- Also, if you keep a _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_, you can add something like this: ```rb repo = "lencx/chatgpt" @@ -54,9 +50,21 @@ tap repo, "https://github.com/#{repo}.git" cask "chatgpt", args: { "no-quarantine": true } ``` +### Linux + +- [chat-gpt_0.7.4_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.deb) +- [chat-gpt_0.7.4_amd64.AppImage](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.AppImage): **works reliably, you can try it if `.deb` fails to run** + +[History versions...](https://github.com/lencx/ChatGPT/releases) + + + +--- + ## 📢 Announcement ### ChatGPT Prompts! + This is a major and exciting update. It works like a `Telegram bot command` and helps you quickly populate custom models to make chatgpt work the way you want it to. This project has taken a lot of my spare time, so if it helps you, please help spread the word or star it would be a great encouragement to me. I hope I can keep updating it and adding more interesting features. ### How does it work? From 3e9c2f8e944c8da991d2dbfdbbfe1bef9bc95317 Mon Sep 17 00:00:00 2001 From: yixinBC Date: Thu, 5 Jan 2023 09:59:15 +0800 Subject: [PATCH 2/6] resdme:zh_cn --- README-ZH_CN.md | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 74c93fd..34afc5d 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -14,38 +14,34 @@ [Awesome ChatGPT](./AWESOME.md) -## 📦 下载 +Buy Me A Coffee + +## 📦 安装 [📝 更新日志](./UPDATE_LOG.md) -**最新版:** +### Windows -- `Mac`: [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) -- `Windows`: [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) -- `Linux`: - - [chat-gpt_0.7.4_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.deb) - - [chat-gpt_0.7.4_amd64.AppImage](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.AppImage): **工作可靠，`.deb` 运行失败时可以尝试它** +- [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) +- 或者使用[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`安装，并且与我们的程序有相同的默认安装路径，这无疑会引发冲突。 -[其他版本...](https://github.com/lencx/ChatGPT/releases) +### Mac - - -Buy Me A Coffee - ---- - -### brew 安装 - -_[Homebrew快捷安装](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ +- [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) +- 如果你偏爱 `.app` 的安装包, 你同样可以在我们的github releases里找到[ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) +- _[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)_ ,你需要添加以下配置: +- 如果你坚持使用 _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_ ,你需要添加以下配置: ```rb repo = "lencx/chatgpt" @@ -53,6 +49,15 @@ tap repo, "https://github.com/#{repo}.git" cask "chatgpt", args: { "no-quarantine": true } ``` +### Linux + +- [chat-gpt_0.7.4_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.deb) +- [chat-gpt_0.7.4_amd64.AppImage](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/chat-gpt_0.7.4_amd64.AppImage): **工作可靠，`.deb` 运行失败时可以尝试它** + + + +--- + ## 📢 公告 这是一个令人兴奋的重大更新。像 `Telegram 机器人指令` 那样工作，帮助你快速填充自定模型，来让 ChatGPT 按照你想要的方式去工作。这个项目倾注了我大量业余时间，如果它对你有所帮助，宣传转发，或者 star 都是对我的巨大鼓励。我希望我可以持续更新下去，加入更多有趣的功能。 From 2f0e617b1a716151ecba70a5e1e02c5ae30ce4a4 Mon Sep 17 00:00:00 2001 From: yixinBC Date: Thu, 5 Jan 2023 10:15:41 +0800 Subject: [PATCH 3/6] readme:install conflict --- README-ZH_CN.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 34afc5d..f3d905b 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -28,7 +28,7 @@ - 或者使用[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`安装，并且与我们的程序有相同的默认安装路径，这无疑会引发冲突。 +- 我们收到[报告](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) 称另一个 [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) 与我们的程序有相同的默认安装路径，但是你可以通过在安装时选择不同的安装路径来避免这种情况。 ### Mac diff --git a/README.md b/README.md index b9a8d96..3b9985e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ - 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. +- we have just received a [report](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) that another [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) has the same default `msi` installation path, but you can specify the installation path when installing the msi. ### Mac From fc6912eb591d5c8a4bdf88c8690f57ecd3561e4e Mon Sep 17 00:00:00 2001 From: yixinBC Date: Thu, 5 Jan 2023 10:52:02 +0800 Subject: [PATCH 4/6] Revert "readme:install conflict" This reverts commit 2f0e617b1a716151ecba70a5e1e02c5ae30ce4a4. --- README-ZH_CN.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index f3d905b..34afc5d 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -28,7 +28,7 @@ - 或者使用[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/) 与我们的程序有相同的默认安装路径，但是你可以通过在安装时选择不同的安装路径来避免这种情况。 +- 我们收到[报告](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) 称另一个 [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) 也可以通过 `winget`安装，并且与我们的程序有相同的默认安装路径，这无疑会引发冲突。 ### Mac diff --git a/README.md b/README.md index 3b9985e..b9a8d96 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ - 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/) has the same default `msi` installation path, but you can specify the installation path when installing the msi. +- 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. ### Mac From cf09dbe429374944d580c6b77f182eb90b7fac87 Mon Sep 17 00:00:00 2001 From: lencx Date: Thu, 5 Jan 2023 11:45:01 +0800 Subject: [PATCH 5/6] readme --- README-ZH_CN.md | 29 ++++++++++++++--------------- README.md | 33 +++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 34afc5d..79e04f0 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -12,8 +12,6 @@ [![chat](https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord)](https://discord.gg/aPhCRf4zZr) [![lencx](https://img.shields.io/twitter/follow/lencx_.svg?style=social)](https://twitter.com/lencx_) -[Awesome ChatGPT](./AWESOME.md) - Buy Me A Coffee ## 📦 安装 @@ -25,7 +23,7 @@ ### Windows - [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) -- 或者使用[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 --version 0.7.4` - 我们收到[报告](https://github.com/lencx/ChatGPT/issues/142#issuecomment-1371166972) 称另一个 [chatgpt](https://github.com/sonnylazuardi/chatgpt-desktop/) 也可以通过 `winget`安装，并且与我们的程序有相同的默认安装路径，这无疑会引发冲突。 @@ -33,21 +31,22 @@ ### Mac - [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) -- 如果你偏爱 `.app` 的安装包, 你同样可以在我们的github releases里找到[ChatGPT.app.tar.gz](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT.app.tar.gz) -- _[Homebrew快捷安装](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ +- 如果你偏爱 `.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 -``` + ```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)_ ,你需要添加以下配置: + 如果你坚持使用 _[Brewfile](https://github.com/Homebrew/homebrew-bundle#usage)_ ，你需要添加以下配置: -```rb -repo = "lencx/chatgpt" -tap repo, "https://github.com/#{repo}.git" -cask "chatgpt", args: { "no-quarantine": true } -``` + ```rb + repo = "lencx/chatgpt" + tap repo, "https://github.com/#{repo}.git" + cask "chatgpt", args: { "no-quarantine": true } + ``` ### Linux diff --git a/README.md b/README.md index b9a8d96..57024ce 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ ### 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/): - `winget install --id=lencx.ChatGPT -e` - `winget install --id=lencx.ChatGPT -e --version 0.7.4` @@ -33,22 +33,23 @@ ### 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) -- or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ +- 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 -brew tap lencx/chatgpt https://github.com/lencx/ChatGPT.git -brew install --cask chatgpt --no-quarantine -``` + ```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: + 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" -cask "chatgpt", args: { "no-quarantine": true } -``` + ```rb + repo = "lencx/chatgpt" + tap repo, "https://github.com/#{repo}.git" + cask "chatgpt", args: { "no-quarantine": true } + ``` ### Linux @@ -148,7 +149,7 @@ You can look at **[awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt Currently, only json and csv are supported for synchronizing custom files, and the following formats need to be met, otherwise the application will be abnormal： -> JSON format: +`JSON format:` ```json [ @@ -165,7 +166,7 @@ Currently, only json and csv are supported for synchronizing custom files, and t ] ``` -> CSV format +`CSV format` ```csv "cmd","act","prompt" From e7ed106a010dbea76e0d9c16b44ab98552cb5d41 Mon Sep 17 00:00:00 2001 From: lencx Date: Thu, 5 Jan 2023 11:48:43 +0800 Subject: [PATCH 6/6] readme --- README-ZH_CN.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 79e04f0..fe1f0d7 100644 --- a/README-ZH_CN.md +++ b/README-ZH_CN.md @@ -32,7 +32,7 @@ - [ChatGPT_0.7.4_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.4/ChatGPT_0.7.4_x64.dmg) - 如果你偏爱 `.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)):_ ```sh diff --git a/README.md b/README.md index 57024ce..e184ecb 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ - 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 +- Homebrew \ Or you can install with _[Homebrew](https://brew.sh) ([Cask](https://docs.brew.sh/Cask-Cookbook)):_ ```sh