diff --git a/kernel/model/export.go b/kernel/model/export.go index 0346c8fb8..6d22d6dda 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -528,7 +528,7 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string if util.IsSymlinkPath(util.AppearancePath) { // Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173 var readErr error - appearancePath, readErr = os.Readlink(util.AppearancePath) + appearancePath, readErr = filepath.EvalSymlinks(util.AppearancePath) if nil != readErr { logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr) return @@ -678,7 +678,7 @@ func ExportHTML(id, savePath string, pdf, image, keepFold, merge bool) (name, do if util.IsSymlinkPath(util.AppearancePath) { // Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173 var readErr error - appearancePath, readErr = os.Readlink(util.AppearancePath) + appearancePath, readErr = filepath.EvalSymlinks(util.AppearancePath) if nil != readErr { logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr) return diff --git a/kernel/util/working.go b/kernel/util/working.go index 77bc45485..6cc8cfd90 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -392,15 +392,10 @@ func initMime() { func GetDataAssetsAbsPath() (ret string) { ret = filepath.Join(DataDir, "assets") - var err error - stat, err := os.Lstat(ret) - if nil != err { - logging.LogErrorf("stat assets failed: %s", err) - return - } - if 0 != stat.Mode()&os.ModeSymlink { + if IsSymlinkPath(ret) { // 跟随符号链接 https://github.com/siyuan-note/siyuan/issues/5480 - ret, err = os.Readlink(ret) + var err error + ret, err = filepath.EvalSymlinks(ret) if nil != err { logging.LogErrorf("read assets link failed: %s", err) }