Upload New Files

Author: mxnt10

Cargo.lock

@@ -1,20 +1,20 @@
 [package]
 name = "ALPack"
-version = "3.1.0"
+version = "3.1.1"
 edition = "2024"
 
 [dependencies]
 pico-args = { version = "0.5" }
-ureq = { version = "3.0", features = ["charset"] }
+ureq = { version = "3.1", features = ["charset"] }
 scraper = { version = "0.25" }
-regex = { version = "1.11" }
-indicatif = {  version = "0.18" }
+regex = { version = "1.12" }
+indicatif = { version = "0.18" }
 flate2 = { version = "1.1" }
 tar = { version = "0.4" }
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 toml = {  version = "0.9" }
-walkdir_minimal = {  version = "1.0" }
-which = {  version = "8.0" }
+walkdir_minimal = { version = "1.0" }
+which = { version = "8.0" }
 
 [profile.release]
 opt-level = "z"

Cargo.toml

@@ -1,6 +1,10 @@
+Fri Jan 30 21:19:00 -03 2026:
+    - fallback if --apkbuild is dir
+    - fix no_group option
+    - add default install: glib-dev glib-static libtool
 Fri Oct 24 20:02:13 -03 2025:
     - update dependency scraper
-    - add default install cmake and go
+    - add default install: cmake go xz
     - fix function for cache dir
 Tue Sep 16 23:01:59 -03 2025:
     - Code rewritten from shell to Rust

changelog

@@ -1,5 +1,6 @@
 use crate::command::Command;
 use crate::settings::Settings;
+use crate::setup::DEF_PACKAGES;
 use crate::utils::_parse_key_value;
 use crate::{parse_key_value, utils};
 
@@ -34,6 +35,7 @@ impl Builder {
         }
 
         let mut cmd_args = Vec::new();
+        let mut concat_args = Vec::new();
         let mut apkbuild_file = String::new();
 
         let sett = Settings::load_or_create();
@@ -87,6 +89,8 @@ impl Builder {
                     fs::copy(apkbuild_file.clone(), &dest_file)?;
 
                     Self::run_abuild(rootfs_dir.clone(), dir_name)?;
+                } else if file_path.is_dir() {
+                    concat_args.push(apkbuild_file);
                 } else {
                     eprintln!(
                         "\x1b[1;33mWarning\x1b[0m: Invalid file: {}, expected 'APKBUILD'",
@@ -101,7 +105,9 @@ impl Builder {
             }
         }
 
-        for p in cmd_args {
+        concat_args.extend(cmd_args);
+
+        for p in concat_args {
             let path = Path::new(&p);
             let (pkg_name, mut dir_name): (String, String);
             let mut copy_only_apkbuild = false;
@@ -210,15 +216,16 @@ impl Builder {
     fn run_abuild(rootfs: String, dir_name: String) -> Result<(), Box<dyn Error>> {
         let cmd = format!(
             "
-            type abuild > /dev/null || apk add alpine-sdk autoconf automake
+            type abuild > /dev/null || apk add {a}
             HOME=/build
             test -f /etc/apk/keys/{u}*.rsa.pub && exit
             rm -rf /build/.abuild
             mkdir -p /build
             abuild-keygen -a -n
             cp -v /build/.abuild/{u}*.rsa.pub /etc/apk/keys/
-        ",
-            u = env::var("USER").unwrap()
+            ",
+            u = env::var("USER").unwrap(),
+            a = DEF_PACKAGES
         );
 
         Command::run(rootfs.clone(), None, Some(cmd), false, false, false)?;

src/builder.rs

@@ -92,6 +92,13 @@ impl Command {
     fn build_proot_options(rootfs: String, rootfs_args: String, no_extra_binds: bool, no_group: bool) -> String {
         let mut proot_options = format!("-R {rootfs} --bind=/media --bind=/mnt {rootfs_args}");
 
+        if no_group {
+            proot_options.push_str(format!(
+                " --bind={rootfs}/etc/group:/etc/group \
+                  --bind={rootfs}/etc/passwd:/etc/passwd").as_str()
+            );
+        }
+
         if !no_extra_binds {
             if Path::new("/etc/asound.conf").exists() {
                 proot_options.push_str(" --bind=/etc/asound.conf");
@@ -112,13 +119,6 @@ impl Command {
                 proot_options.push_str(" --bind=/usr/share/themes");
             }
 
-            if no_group {
-                proot_options.push_str(format!(
-                    " --bind={rootfs}/etc/group:/etc/group \
-                    --bind={rootfs}/etc/passwd:/etc/passwd").as_str()
-                );
-            }
-
             if let Ok(entries) = fs::read_dir("/usr/share/icons") {
                 for entry in entries.flatten() {
                     let path = entry.path().join("cursors");

src/command.rs

@@ -16,6 +16,9 @@ use std::path::Path;
 use std::{fs, io};
 use tar::Archive;
 
+pub const DEF_PACKAGES: &str =
+    "alpine-sdk autoconf automake cmake glib-dev glib-static libtool go xz";
+
 pub struct Setup {
     name: String,
     remaining_args: Vec<String>,
@@ -160,7 +163,7 @@ impl Setup {
             Command::run(
                 dest_rootfs,
                 None,
-                Some("apk add alpine-sdk autoconf automake cmake go xz".to_string()),
+                Some(format!("apk add {DEF_PACKAGES}")),
                 true,
                 true,
                 false,