Skip to content

fix: parse storage path #2913

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

Merged
merged 4 commits into from
Oct 28, 2024
Merged

fix: parse storage path #2913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03a5d0e
fix: parse storage path
carsakiller Oct 25, 2024
7a3c04c
refactor: ensure config was given?
carsakiller Oct 25, 2024
5841998
chore: update changelog
carsakiller Oct 25, 2024
4641d8f
Merge branch 'master' into parse-storage-path
sumneko Oct 28, 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
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased
<!-- Add all new changes here. They will be moved under a version at release -->
* `FIX` A regression related to type narrow and generic param introduced since `v3.10.1`
* `FIX` Parse storagePath to improve reliability of resolving ${addons} placeholder
* `FIX` Reference should also look in tablefield
* `FIX` Determine that the index of `{...}` is an integer when iterating

Expand Down
6 changes: 3 additions & 3 deletions script/files.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,10 +919,10 @@ function m.resolvePathPlaceholders(path)
if addonsPath then
return addonsPath
end
local client = require 'client'
local storagePath = client.getOption('storagePath')
local client = require("client")
local storagePath = client.getOption("storagePath")
if storagePath then
addonsPath = storagePath .. "/addonManager/addons"
addonsPath = (fs.path(storagePath) / "addonManager" / "addons"):string()
else
-- Common path across OSes
local dataPath = "User/globalStorage/sumneko.lua/addonManager/addons"
Expand Down
Loading