use pkgbase instead of pkgname for multi-packages, some faster build options

4 files changed, 10 insertions, 6 deletions

diff --git a/makepkg.conf b/makepkg.conf
index 8b7ca48..3fa8a97 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -48,7 +48,7 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j12"
+MAKEFLAGS="-j$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
@@ -139,7 +139,7 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -T0 --ultra -20 -)
+COMPRESSZST=(zstd -c -T0 -12 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
diff --git a/pacman.conf b/pacman.conf
index 10af4be..02dc7c4 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -85,6 +85,8 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
+[multilib]
+Include = /etc/pacman.d/mirrorlist
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
diff --git a/src/lib.rs b/src/lib.rs
index 91814f0..846fe0b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,8 @@ pub struct PackageMeta {
     pub id: u32,
     #[serde(alias = "Name")]
     pub name: String,
+    #[serde(alias = "PackageBase")]
+    pub pkgbase: String,
     #[serde(alias = "Version")]
     pub version: String,
     #[serde(alias = "Description")]
diff --git a/src/main.rs b/src/main.rs
index 5b0ced8..305fc48 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,7 +34,7 @@ pub fn build_pkg(package_name: &str, package_list: &[PackageMeta], handle: &Alpm
     let pkg_dir = format!(
         "{}/pkgbuild/{}",
         dirs::cache_dir().unwrap().to_str().unwrap(),
-        package_name
+        &package.pkgbase
     );
 
     if dbg!(std::path::Path::new(dbg!(&pkg_dir)).exists()) {
@@ -56,7 +56,7 @@ pub fn build_pkg(package_name: &str, package_list: &[PackageMeta], handle: &Alpm
             .arg("clone")
             .arg("--single-branch")
             .arg("--branch")
-            .arg(&package_name)
+            .arg(&package.pkgbase)
             .arg(format!(
                 "{}/aur.git",
                 dirs::home_dir().unwrap().to_str().unwrap()
@@ -95,7 +95,7 @@ pub fn build_pkg(package_name: &str, package_list: &[PackageMeta], handle: &Alpm
             .current_dir(&pkg_dir)
             .arg("-u")
             .arg("-l")
-            .arg(&package_name)
+            .arg(&package.pkgbase)
             .arg("-r")
             .arg(chroot_dir)
             .arg("-D")
@@ -118,7 +118,7 @@ pub fn build_pkg(package_name: &str, package_list: &[PackageMeta], handle: &Alpm
             .arg("-d")
             .arg("/var/cache/pacman/pkg/")
             .arg("--")
-            .args(["--skippgpcheck", "--syncdeps"]);
+            .args(["--skippgpcheck", "--syncdeps", "--nocheck"]);
         dbg!(&command);
         print_status(command.spawn());
     }