forked from cerc-io/plugeth
cmd/utils: avoid making console preloads absolute (#22109)
Resolves https://github.com/etclabscore/core-geth/issues/273 jsre.JSRE already handles establishing preload file paths relative to the 'assets' path (aka docroot), where it joins the assets dir and the file path if relative, or uses the file path only if absolute. The duplication of this logic by MakeConsolePreloads caused preloaded files to have paths which contained duplicate references to the assets dir path. Date: 2020-12-30 08:25:01-06:00 Signed-off-by: meows <b5c6@protonmail.com>
This commit is contained in:
parent
984e752ce5
commit
23f837c388
@ -1908,9 +1908,8 @@ func MakeConsolePreloads(ctx *cli.Context) []string {
|
||||
// Otherwise resolve absolute paths and return them
|
||||
var preloads []string
|
||||
|
||||
assets := ctx.GlobalString(JSpathFlag.Name)
|
||||
for _, file := range strings.Split(ctx.GlobalString(PreloadJSFlag.Name), ",") {
|
||||
preloads = append(preloads, common.AbsolutePath(assets, strings.TrimSpace(file)))
|
||||
preloads = append(preloads, strings.TrimSpace(file))
|
||||
}
|
||||
return preloads
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user