diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6749373..3fbc4b2 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,8 +3,7 @@ name: Bug report about: Create a report to help us improve title: "[BUG]" labels: bug -assignees: '' - +assignees: "" --- **Describe the bug** @@ -12,6 +11,7 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Information** - - OS: [e.g. macOS] - - Clash Verge Version: [e.g. 1.3.4] - - Clash Core: [e.g. Clash or Clash Meta] + +- OS: [e.g. macOS] +- Clash Nyanpasu Version: [e.g. 1.3.4] +- Clash Core: [e.g. Clash or Clash Meta] **Additional context** Add any other context about the problem here. diff --git a/scripts/aarch.mjs b/scripts/aarch.mjs index 989e774..b0730d5 100644 --- a/scripts/aarch.mjs +++ b/scripts/aarch.mjs @@ -45,8 +45,8 @@ async function resolve() { const join = (p) => path.join(bundlePath, p); const appPathList = [ - join("macos/Clash Verge.aarch64.app.tar.gz"), - join("macos/Clash Verge.aarch64.app.tar.gz.sig"), + join("macos/Clash Nyanpasu.aarch64.app.tar.gz"), + join("macos/Clash Nyanpasu.aarch64.app.tar.gz.sig"), ]; for (const appPath of appPathList) { @@ -55,8 +55,8 @@ async function resolve() { } } - fs.copyFileSync(join("macos/Clash Verge.app.tar.gz"), appPathList[0]); - fs.copyFileSync(join("macos/Clash Verge.app.tar.gz.sig"), appPathList[1]); + fs.copyFileSync(join("macos/Clash Nyanpasu.app.tar.gz"), appPathList[0]); + fs.copyFileSync(join("macos/Clash Nyanpasu.app.tar.gz.sig"), appPathList[1]); const options = { owner: context.repo.owner, repo: context.repo.repo }; const github = getOctokit(process.env.GITHUB_TOKEN); @@ -69,7 +69,7 @@ async function resolve() { if (!release.id) throw new Error("failed to find the release"); await uploadAssets(release.id, [ - join(`dmg/Clash Verge_${version}_aarch64.dmg`), + join(`dmg/Clash Nyanpasu_${version}_aarch64.dmg`), ...appPathList, ]); } diff --git a/scripts/portable.mjs b/scripts/portable.mjs index b523a50..446f380 100644 --- a/scripts/portable.mjs +++ b/scripts/portable.mjs @@ -17,7 +17,7 @@ async function resolvePortable() { const zip = new AdmZip(); - zip.addLocalFile(path.join(releaseDir, "Clash Verge.exe")); + zip.addLocalFile(path.join(releaseDir, "Clash Nyanpasu.exe")); zip.addLocalFile(path.join(releaseDir, "clash.exe")); zip.addLocalFile(path.join(releaseDir, "clash-meta.exe")); zip.addLocalFolder(path.join(releaseDir, "resources"), "resources"); @@ -26,7 +26,7 @@ async function resolvePortable() { const packageJson = require("../package.json"); const { version } = packageJson; - const zipFile = `Clash.Verge_${version}_x64_portable.zip`; + const zipFile = `Clash.Nyanpasu_${version}_x64_portable.zip`; zip.writeZip(zipFile); console.log("[INFO]: create portable zip successfully"); diff --git a/src-tauri/src/config/clash.rs b/src-tauri/src/config/clash.rs index d775513..e146b24 100644 --- a/src-tauri/src/config/clash.rs +++ b/src-tauri/src/config/clash.rs @@ -58,7 +58,7 @@ impl IClashTemp { help::save_yaml( &dirs::clash_path()?, &self.0, - Some("# Generated by Clash Verge"), + Some("# Generated by Clash Nyanpasu"), ) } diff --git a/src-tauri/src/config/config.rs b/src-tauri/src/config/config.rs index e5af8e5..89855c7 100644 --- a/src-tauri/src/config/config.rs +++ b/src-tauri/src/config/config.rs @@ -57,7 +57,7 @@ impl Config { help::save_yaml( &runtime_path, &Config::clash().latest().0, - Some("# Clash Verge Runtime"), + Some("# Clash Nyanpasu Runtime"), )?; } } @@ -78,7 +78,7 @@ impl Config { .as_ref() .ok_or(anyhow!("failed to get runtime config"))?; - help::save_yaml(&path, &config, Some("# Generated by Clash Verge"))?; + help::save_yaml(&path, &config, Some("# Generated by Clash Nyanpasu"))?; Ok(path) } diff --git a/src-tauri/src/config/profiles.rs b/src-tauri/src/config/profiles.rs index 92add4c..74ffa81 100644 --- a/src-tauri/src/config/profiles.rs +++ b/src-tauri/src/config/profiles.rs @@ -69,7 +69,7 @@ impl IProfiles { help::save_yaml( &dirs::profiles_path()?, self, - Some("# Profiles Config for Clash Verge"), + Some("# Profiles Config for Clash Nyanpasu"), ) } diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs index 708ce61..d4aaa1f 100644 --- a/src-tauri/src/config/verge.rs +++ b/src-tauri/src/config/verge.rs @@ -143,7 +143,7 @@ impl IVerge { /// Save IVerge App Config pub fn save_file(&self) -> Result<()> { - help::save_yaml(&dirs::verge_path()?, &self, Some("# Clash Verge Config")) + help::save_yaml(&dirs::verge_path()?, &self, Some("# Clash Nyanpasu Config")) } /// patch verge config diff --git a/src-tauri/src/core/manager.rs b/src-tauri/src/core/manager.rs index fdb9269..5503569 100644 --- a/src-tauri/src/core/manager.rs +++ b/src-tauri/src/core/manager.rs @@ -13,7 +13,7 @@ pub fn grant_permission(core: String) -> anyhow::Result<()> { #[cfg(target_os = "macos")] let output = { - // the path of clash /Applications/Clash Verge.app/Contents/MacOS/clash + // the path of clash /Applications/Clash Nyanpasu.app/Contents/MacOS/clash // https://apple.stackexchange.com/questions/82967/problem-with-empty-spaces-when-executing-shell-commands-in-applescript // let path = escape(&path); let path = path.replace(' ', "\\\\ "); diff --git a/src-tauri/src/core/sysopt.rs b/src-tauri/src/core/sysopt.rs index b2f5255..1ffebcd 100644 --- a/src-tauri/src/core/sysopt.rs +++ b/src-tauri/src/core/sysopt.rs @@ -158,7 +158,7 @@ impl Sysopt { #[cfg(target_os = "windows")] let app_path = format!("\"{app_path}\""); - // use the /Applications/Clash Verge.app path + // use the /Applications/Clash Nyanpasu.app path #[cfg(target_os = "macos")] let app_path = (|| -> Option { let path = std::path::PathBuf::from(&app_path); diff --git a/src-tauri/src/core/win_service.rs b/src-tauri/src/core/win_service.rs index 865895b..12d8cc4 100644 --- a/src-tauri/src/core/win_service.rs +++ b/src-tauri/src/core/win_service.rs @@ -30,7 +30,7 @@ pub struct JsonResponse { pub data: Option, } -/// Install the Clash Verge Service +/// Install the Clash Nyanpasu Service /// 该函数应该在协程或者线程中执行,避免UAC弹窗阻塞主线程 pub async fn install_service() -> Result<()> { let binary_path = dirs::service_path()?; @@ -60,7 +60,7 @@ pub async fn install_service() -> Result<()> { Ok(()) } -/// Uninstall the Clash Verge Service +/// Uninstall the Clash Nyanpasu Service /// 该函数应该在协程或者线程中执行,避免UAC弹窗阻塞主线程 pub async fn uninstall_service() -> Result<()> { let binary_path = dirs::service_path()?; @@ -99,10 +99,10 @@ pub async fn check_service() -> Result { .get(url) .send() .await - .context("failed to connect to the Clash Verge Service")? + .context("failed to connect to the Clash Nyanpasu Service")? .json::() .await - .context("failed to parse the Clash Verge Service response")?; + .context("failed to parse the Clash Nyanpasu Service response")?; Ok(response) } @@ -148,7 +148,7 @@ pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> { .await? .json::() .await - .context("failed to connect to the Clash Verge Service")?; + .context("failed to connect to the Clash Nyanpasu Service")?; if res.code != 0 { bail!(res.msg); @@ -168,7 +168,7 @@ pub(super) async fn stop_core_by_service() -> Result<()> { .await? .json::() .await - .context("failed to connect to the Clash Verge Service")?; + .context("failed to connect to the Clash Nyanpasu Service")?; if res.code != 0 { bail!(res.msg); diff --git a/src-tauri/src/utils/init.rs b/src-tauri/src/utils/init.rs index 2fae79d..9ec564a 100644 --- a/src-tauri/src/utils/init.rs +++ b/src-tauri/src/utils/init.rs @@ -93,21 +93,21 @@ pub fn init_config() -> Result<()> { crate::log_err!(dirs::clash_path().map(|path| { if !path.exists() { - help::save_yaml(&path, &IClashTemp::template().0, Some("# Clash Verge"))?; + help::save_yaml(&path, &IClashTemp::template().0, Some("# Clash Nyanpasuasu"))?; } >::Ok(()) })); crate::log_err!(dirs::verge_path().map(|path| { if !path.exists() { - help::save_yaml(&path, &IVerge::template(), Some("# Clash Verge"))?; + help::save_yaml(&path, &IVerge::template(), Some("# Clash Nyanpasu"))?; } >::Ok(()) })); crate::log_err!(dirs::profiles_path().map(|path| { if !path.exists() { - help::save_yaml(&path, &IProfiles::template(), Some("# Clash Verge"))?; + help::save_yaml(&path, &IProfiles::template(), Some("# Clash Nyanpasu"))?; } >::Ok(()) })); diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs index 14d4bdd..ca3afc7 100644 --- a/src-tauri/src/utils/resolve.rs +++ b/src-tauri/src/utils/resolve.rs @@ -59,7 +59,7 @@ pub fn create_window(app_handle: &AppHandle) { "main".to_string(), tauri::WindowUrl::App("index.html".into()), ) - .title("Clash Verge") + .title("Clash Nyanpasu") .fullscreen(false) .min_inner_size(600.0, 520.0); diff --git a/src/components/setting/mods/clash-field-viewer.tsx b/src/components/setting/mods/clash-field-viewer.tsx index 8185cba..aeecbde 100644 --- a/src/components/setting/mods/clash-field-viewer.tsx +++ b/src/components/setting/mods/clash-field-viewer.tsx @@ -100,7 +100,7 @@ export const ClashFieldViewer = forwardRef((props, ref) => { - Clash Verge Control Fields + Clash Nyanpasu Control Fields diff --git a/src/components/setting/mods/service-viewer.tsx b/src/components/setting/mods/service-viewer.tsx index 839c8c2..add78ff 100644 --- a/src/components/setting/mods/service-viewer.tsx +++ b/src/components/setting/mods/service-viewer.tsx @@ -90,7 +90,7 @@ export const ServiceViewer = forwardRef((props, ref) => { {(state === "unknown" || state === "uninstall") && ( - Information: Please make sure that the Clash Verge Service is + Information: Please make sure that the Clash Nyanpasu Service is installed and enabled )} diff --git a/src/components/setting/setting-verge.tsx b/src/components/setting/setting-verge.tsx index d54094d..1cd7baa 100644 --- a/src/components/setting/setting-verge.tsx +++ b/src/components/setting/setting-verge.tsx @@ -56,7 +56,7 @@ const SettingVerge = ({ onError }: Props) => { }); return ( - + @@ -192,7 +192,7 @@ const SettingVerge = ({ onError }: Props) => { )} - + v{version} diff --git a/src/index.html b/src/index.html index 90966cb..c250504 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ type="image/x-icon" /> - Clash Verge + Clash Nyanpasu