From daa683ef1121165e2e5eae078c46fc462e175bcf Mon Sep 17 00:00:00 2001
From: KAAAsS <admin@kaaass.net>
Date: Wed, 2 Apr 2025 17:31:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=82=E9=85=8D=200.103?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 knotfiles/constraints.nu        | 4 ++--
 knotfiles/dotfile/constraint.nu | 4 +---
 knotfiles/pkg.nu                | 8 ++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/knotfiles/constraints.nu b/knotfiles/constraints.nu
index 0740db3..1ef3ab3 100644
--- a/knotfiles/constraints.nu
+++ b/knotfiles/constraints.nu
@@ -8,7 +8,7 @@ module os {
         if (which uname | is-empty) {
             false
         } else {
-            (uname -s) == "Linux"
+            (uname | get kernel-name) == "Linux"
         }
     }
 
@@ -16,7 +16,7 @@ module os {
         if (which uname | is-empty) {
             false
         } else {
-            (uname -s) == "Darwin"
+            (uname | get kernel-name) == "Darwin"
         }
     }
 }
diff --git a/knotfiles/dotfile/constraint.nu b/knotfiles/dotfile/constraint.nu
index d3a6a91..9ae6c98 100644
--- a/knotfiles/dotfile/constraint.nu
+++ b/knotfiles/dotfile/constraint.nu
@@ -37,7 +37,6 @@ export def check_constraint [
     name: string,
     --no-run
 ] {
-    let span = (metadata $name).span;
     let constraints = (global_conf get_config "_" "constraints")
     
     # 检查约束是否存在
@@ -46,8 +45,7 @@ export def check_constraint [
             msg: $"约束 ($name) 不存在",
             label: {
                 text: "约束名",
-                start: $span.start,
-                end: $span.end
+                span: (metadata $name).span
             }
         }
     }
diff --git a/knotfiles/pkg.nu b/knotfiles/pkg.nu
index eab18f1..786919b 100644
--- a/knotfiles/pkg.nu
+++ b/knotfiles/pkg.nu
@@ -95,7 +95,6 @@ export def install [
     --manager: string
 ] {
     use log.nu
-    let span = (metadata $pkg_name).span;
 
     if (check_install? --manager=$manager $pkg_name) {
         log info $"包 ($pkg_name) 已经安装，跳过"
@@ -113,8 +112,7 @@ export def install [
                 msg: $"无法安装包 ($pkg_name)",
                 label: {
                     text: "包名",
-                    start: $span.start,
-                    end: $span.end
+                    span: (metadata $pkg_name).span
                 }
             }
         }
@@ -127,7 +125,6 @@ export def uninstall [
     --manager: string
 ] {
     use log.nu
-    let span = (metadata $pkg_name).span;
 
     if (not (check_install? --manager=$manager $pkg_name)) {
         log info $"未安装包 ($pkg_name)，跳过"
@@ -145,8 +142,7 @@ export def uninstall [
                 msg: $"无法卸载包 ($pkg_name)",
                 label: {
                     text: "包名",
-                    start: $span.start,
-                    end: $span.end
+                    span: (metadata $pkg_name).span
                 }
             }
         }