update

Author: QaidVoid

sbuild-linter/src/build_config/mod.rs

@@ -128,6 +128,10 @@ impl BuildConfig {
         if let Some(val) = values.get("app_id") {
             config.app_id = val.as_str().map(String::from);
         }
+        // Support both pkgver and version field names
+        if let Some(val) = values.get("pkgver").or_else(|| values.get("version")) {
+            config.pkgver = val.as_str().map(String::from);
+        }
         if let Some(val) = values.get("build_util") {
             config.build_util = to_string_vec(val);
         }

sbuild-linter/src/validator.rs

@@ -1402,6 +1402,7 @@ pub const FIELD_VALIDATORS: &[FieldValidator] = &[
     FieldValidator::new("app_id", FieldType::String, false),
     FieldValidator::new("pkg_type", FieldType::String, false),
     FieldValidator::new("pkgver", FieldType::String, false),
+    FieldValidator::new("version", FieldType::String, false),  // Alias for pkgver
     FieldValidator::new("build_util", FieldType::StringArray, false),
     FieldValidator::new("build_asset", FieldType::BuildAsset, false),
     FieldValidator::new("category", FieldType::StringArray, false),

sbuild-meta/src/main.rs

@@ -372,7 +372,7 @@ async fn cmd_should_rebuild(
     }
 
     // Check if version field exists
-    if recipe.version.is_none() {
+    if recipe.pkgver.is_none() {
         info!("No version field in recipe, should rebuild (new package)");
         std::process::exit(0);
     }
@@ -426,7 +426,7 @@ async fn cmd_check_updates(
 
     for (path, recipe) in enabled_recipes {
         // Only check recipes that have both version and pkgver
-        let current_version = match &recipe.version {
+        let current_version = match &recipe.pkgver {
             Some(v) => v.clone(),
             None => continue, // Skip recipes without explicit version
         };

sbuild-meta/src/metadata.rs

@@ -195,7 +195,7 @@ impl PackageMetadata {
             pkg_family: Some(recipe.pkg.clone()),
             pkg_type: recipe.pkg_type.clone(),
             description: recipe.description.0.clone(),
-            version: recipe.version.clone().unwrap_or_default(),
+            version: recipe.pkgver.clone().unwrap_or_default(),
             src_url: if recipe.src_url.is_empty() {
                 None
             } else {

sbuild-meta/src/recipe.rs

@@ -218,9 +218,9 @@ pub struct SBuildRecipe {
     #[serde(default)]
     pub pkg_type: Option<String>,
 
-    /// Explicit version (managed by bot)
-    #[serde(default)]
-    pub version: Option<String>,
+    /// Explicit version (managed by bot) - supports both "version" and "pkgver" field names
+    #[serde(default, alias = "version")]
+    pub pkgver: Option<String>,
 
     /// Package categories
     #[serde(default)]
@@ -487,7 +487,7 @@ pkg_id: example.com.test
 version: "1.2.3"
 "#;
         let recipe = SBuildRecipe::from_yaml(yaml).unwrap();
-        assert_eq!(recipe.version, Some("1.2.3".to_string()));
+        assert_eq!(recipe.pkgver, Some("1.2.3".to_string()));
     }
 
     #[test]

sbuild/src/ghcr.rs

@@ -101,21 +101,33 @@ impl GhcrClient {
         // Add target
         cmd.arg(&target);
 
-        // Add files with just the filename (not full path)
-        // Format: /full/path/to/file:filename
+        // Collect files and determine working directory
+        // We need to cd to the directory so oras stores just filenames, not full paths
+        let mut work_dir: Option<&Path> = None;
+        let mut filenames: Vec<String> = Vec::new();
+
         for file in files {
             let path = file.as_ref();
             if path.exists() {
+                if work_dir.is_none() {
+                    work_dir = path.parent();
+                }
                 if let Some(filename) = path.file_name() {
-                    // Use oras syntax: local_path:remote_name
-                    let file_arg = format!("{}:{}", path.display(), filename.to_string_lossy());
-                    cmd.arg(file_arg);
-                } else {
-                    cmd.arg(path);
+                    filenames.push(filename.to_string_lossy().to_string());
                 }
             }
         }
 
+        // Add filenames (relative to work_dir)
+        for filename in &filenames {
+            cmd.arg(filename);
+        }
+
+        // Set working directory if we have one
+        if let Some(dir) = work_dir {
+            cmd.current_dir(dir);
+        }
+
         let output = cmd.output()?;
 
         if !output.status.success() {