mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-28 01:34:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add pack-root option (fixes #27)

Browse Source
This commit is contained in:
comp500
2021-06-04 02:10:29 +01:00
parent d6bed7ad4c
commit 8cbe7d4c61
7 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
curseforge/import.go
View File

@@ -224,7 +224,8 @@ var importCmd = &cobra.Command{
}
// TODO: just use mods-folder directly? does texture pack importing affect this?
ref, err := filepath.Abs(filepath.Join(filepath.Dir(core.ResolveMod(modInfoValue.Slug)), fileInfo.FileName))
modFilePath := core.ResolveMod(modInfoValue.Slug, index)
ref, err := filepath.Abs(filepath.Join(filepath.Dir(modFilePath), fileInfo.FileName))
if err == nil {
referencedModPaths = append(referencedModPaths, ref)
}
@@ -243,9 +244,9 @@ var importCmd = &cobra.Command{
}
successes = 0
indexFolder := filepath.Dir(filepath.Join(filepath.Dir(viper.GetString("pack-file")), filepath.FromSlash(pack.Index.File)))
packRoot := index.GetPackRoot()
for _, v := range filesList {
filePath := filepath.Join(indexFolder, filepath.FromSlash(v.Name()))
filePath := filepath.Join(packRoot, filepath.FromSlash(v.Name()))
filePathAbs, err := filepath.Abs(filePath)
if err == nil {
found := false