handle provides and automate dynamic appimage conversion

Author: QaidVoid

Cargo.lock

@@ -33,10 +33,11 @@ Usage: sbuild [OPTIONS] [FILES]
 A builder for SBUILD package files.
 
 Options:
-   --help, -h            Show this help message
-   --debug, -d           Execute build scripts in debug mode
-   --outdir, -o <PATH>   Directory to store the build files in
-   --timeout <DURATION>  Timeout duration after which the pkgver check exits
+   --help, -h                   Show this help message
+   --log-level                  Log level for build script: info/1 (default), verbose/2, debug/3
+   --keep, -k                   Whether to keep sbuild temp directory
+   --outdir, -o <PATH>          Directory to store the build files in
+   --timeout-linter <DURATION>  Timeout duration after which the linter exists
 
 Arguments:
    FILE...               One or more package files to build

README.md

@@ -1,7 +1,7 @@
 [package]
 name = "sbuild-linter"
 description = "Linter for SBUILD package files"
-version = "0.4.0"
+version = "0.4.1"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

sbuild-linter/Cargo.toml

@@ -1,9 +1,11 @@
 use std::{
     collections::HashSet,
+    env,
     fmt::Display,
     fs::{File, Permissions},
     io::{BufRead, BufReader, BufWriter, Write},
     os::unix::fs::PermissionsExt,
+    path::Path,
     process::{Command, ExitStatus},
     sync, thread,
     time::Duration,
@@ -76,7 +78,14 @@ impl Linter {
             }
         };
 
-        logger.info(&format!("Linting {}", file_path));
+        let path = Path::new(&file_path);
+        let real_path = if path.is_absolute() {
+            path
+        } else {
+            let current_dir = env::current_dir().expect("Failed to get current directory");
+            &current_dir.join(path)
+        };
+        logger.info(format!("Linting {} ({})\n", file_path, real_path.display()));
         match self.deserialize_yaml(&yaml_str) {
             Ok(config) => {
                 if disable_shellcheck {

sbuild-linter/src/lib.rs

@@ -76,10 +76,17 @@ impl TaskLogger {
                 let seconds = total_seconds % 60;
                 let milliseconds = (elapsed.subsec_millis()) as u64;
 
-                let timestamp = format!("[{:02}:{:02}.{:03}]", minutes, seconds, milliseconds);
-
-                let msg = format!("{} {}", timestamp, msg);
-                let _ = writeln!(file_guard.file, "{}", msg);
+                let msg = format!("{}\n", msg);
+                for line in msg.lines() {
+                    let timestamp = format!("[{:02}:{:02}.{:03}]", minutes, seconds, milliseconds);
+
+                    let line = if line.is_empty() {
+                        format!("{}", timestamp)
+                    } else {
+                        format!("{}➜ {}", timestamp, line)
+                    };
+                    let _ = writeln!(file_guard.file, "{}", line);
+                }
             }
         }
     }

sbuild-linter/src/logger.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sbuild"
-version = "0.1.0"
+version = "0.1.1"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -17,11 +17,11 @@ goblin = { version = "0.9.2", features = ["elf64", "elf32", "endian_fd", "std"]
 indexmap = "2.6.0"
 memmap2 = "0.9.5"
 reqwest = { version = "0.12.9", features = ["blocking", "http2", "rustls-tls", "stream"], default-features = false }
-sbuild-linter = { version = "0.4.0", path = "../sbuild-linter" }
+sbuild-linter = { version = "0.4.1", path = "../sbuild-linter" }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = { version = "1.0.133", features = ["indexmap"] }
 serde_yml = "0.0.12"
-squishy = { version = "0.3.0", features = ["appimage", "rayon"] }
+squishy = { version = "0.3.1", features = ["appimage"] }
 tempfile = "3.15.0"
 tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread"] }
 which = "7.0.0"