diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index ae177074f..c8d40860c 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -137,7 +137,7 @@ func InstalledIcons() (ret []*Icon) { icon.Size = iconDir.Size() icon.HSize = humanize.Bytes(uint64(icon.Size)) icon.HUpdated = formatUpdated(icon.Updated) - readme, readErr := os.ReadFile(filepath.Join(util.DataDir, "icons", dirName, "README.md")) + readme, readErr := os.ReadFile(filepath.Join(util.AppearancePath, "icons", dirName, "README.md")) if nil != readErr { logging.LogWarnf("read install icon README.md failed: %s", readErr) continue diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index e5af3bdcc..93749cb20 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -63,7 +63,7 @@ type Package struct { } func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) { - p := filepath.Join(util.DataDir, widgetDirName, "widget.json") + p := filepath.Join(util.DataDir, "widgets", widgetDirName, "widget.json") if !gulu.File.IsExist(p) { err = os.ErrNotExist return @@ -85,7 +85,7 @@ func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) { } func IconJSON(iconDirName string) (ret map[string]interface{}, err error) { - p := filepath.Join(util.ThemesPath, "icons", iconDirName, "icon.json") + p := filepath.Join(util.AppearancePath, "icons", iconDirName, "icon.json") if !gulu.File.IsExist(p) { err = os.ErrNotExist return