Skip to content

Commit 1ba1472

Browse files
committed
fix: Fix hash calculation to not crash on missing files
1 parent 775cc83 commit 1ba1472

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

embed_util/packer.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ func CopyForEmbed(out string, dir string) error {
2727
return err
2828
}
2929

30-
return doWriteFilesList(out, fl)
30+
return doWriteFilesList(dir, out, fl)
3131
}
3232

3333
func BuildAndWriteFilesList(dir string) error {
3434
fl, err := buildFileListFromDir(dir)
3535
if err != nil {
3636
return err
3737
}
38-
return doWriteFilesList(dir, fl)
38+
return doWriteFilesList(dir, dir, fl)
3939
}
4040

41-
func doWriteFilesList(dir string, fl *fileList) error {
41+
func doWriteFilesList(srcDir string, outDir string, fl *fileList) error {
4242
var err error
43-
fl.ContentHash, err = calcContentHash(dir, fl)
43+
fl.ContentHash, err = calcContentHash(srcDir, fl)
4444
if err != nil {
4545
return err
4646
}
@@ -49,7 +49,7 @@ func doWriteFilesList(dir string, fl *fileList) error {
4949
return err
5050
}
5151

52-
err = os.WriteFile(filepath.Join(dir, "files.json"), b, 0o644)
52+
err = os.WriteFile(filepath.Join(outDir, "files.json"), b, 0o644)
5353
if err != nil {
5454
return err
5555
}
@@ -175,10 +175,6 @@ func calcContentHash(dir string, fl *fileList) (string, error) {
175175
_ = binary.Write(hash, binary.LittleEndian, fle.Name)
176176
} else if st.Mode().IsRegular() {
177177
outPath := filepath.Join(dir, fle.Name)
178-
if fle.Compressed {
179-
outPath += ".gz"
180-
}
181-
182178
data, err := os.ReadFile(outPath)
183179
if err != nil {
184180
return "", err

0 commit comments

Comments
 (0)