Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clash-verge-rev: Fix config dir #14543

Merged
merged 2 commits into from
Dec 29, 2024
+12 −2
Merged

clash-verge-rev: Fix config dir #14543

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2eecef
clash-verge-rev: Fix config dir
Izumiko Dec 9, 2024
9d018c7
clash-verge-rev: improve directory handling during installation
Izumiko Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions bucket/clash-verge-rev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,25 @@
"installer": {
"script": [
"ensure \"$persist_dir\" | Out-Null",
"New-Item \"$env:USERPROFILE\\.config\\clash-verge\" -ItemType Junction -Target \"$persist_dir\" | Out-Null"
"$targetPath = \"$env:APPDATA\\io.github.clash-verge-rev.clash-verge-rev\"",
"$linkType = (Get-Item -Path $targetPath -ErrorAction SilentlyContinue).LinkType",
"if (Test-Path $targetPath) {",
" if ($linkType -eq 'Junction') {",
" Remove-Item -Path $targetPath -Force",
" } else {",
" Get-ChildItem -Path $targetPath -Force | Move-Item -Destination $persist_dir -Force",
" Remove-Item -Path $targetPath -Force -Recurse",
" }",
"}",
"New-Item \"$env:APPDATA\\io.github.clash-verge-rev.clash-verge-rev\" -ItemType Junction -Target \"$persist_dir\" | Out-Null"
Copy link
Contributor

@mslxl mslxl Dec 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the config of the old version not affect the new version of the software?

Also, @xyalter mentioned that the original approach of using "$persist_dir.config" is still valid in #14494 (comment). I am not sure whether it can cause some related changes. Please check first.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The config of the old version is stored in $persist_dir\.config\io.github.clash-verge-rev.clash-verge-rev, but the new version is directly stored in $persist_dir in my PR, so they should not be conflicted. Also, Clash-verge-rev recommends configuring it from scratch, using 2.x app with v1 config will cause many problems.

$persist_dir\.config is indeed valid. We can use the same portable persist logic, but should move/remove the old config.

]
},
"pre_uninstall": [
"if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
"Start-Process \"$dir\\resources\\uninstall-service.exe\" -Wait -Verb 'RunAs' -WindowStyle 'Hidden'; Start-Sleep -Seconds 3"
],
"uninstaller": {
"script": "Remove-Item \"$env:USERPROFILE\\.config\\clash-verge\" -Recurse -Force -ErrorAction 'SilentlyContinue'"
"script": "Remove-Item \"$env:APPDATA\\io.github.clash-verge-rev.clash-verge-rev\" -Recurse -Force -ErrorAction 'SilentlyContinue'"
},
"shortcuts": [
[
Expand Down