Fixed install_package except WHERE TF IS IT PUTTING THE SYMLINKS

This commit is contained in:
Arthur Beck 2025-03-10 12:49:40 -05:00
parent af2897efb1
commit aa66e60019
Signed by: ArthurB
GPG key ID: ACE3D14F5CEF14BF

View file

@ -6,6 +6,7 @@
clippy::missing_panics_doc clippy::missing_panics_doc
)] )]
#![feature(str_as_str)] #![feature(str_as_str)]
#![feature(impl_trait_in_bindings)]
use std::{ use std::{
ffi::OsString, ffi::OsString,
@ -1076,27 +1077,43 @@ pub fn install_package(
} }
} }
for entry in std::fs::read_dir(&path)? { /// Fuck me.
println!("entry"); #[derive(Clone)]
struct VisitDir<'a> {
/// Fuck me.
f: &'a dyn Fn(std::io::Result<std::fs::DirEntry>, VisitDir) -> std::io::Result<()>
}
let diritem = VisitDir {
f: &|entry: std::io::Result<std::fs::DirEntry>, visit_dir: VisitDir| -> std::io::Result<()> {
let entry = entry?; let entry = entry?;
if entry.file_name() == *".BUILDINFO" if entry.file_name() == *".BUILDINFO"
|| entry.file_name() == *".MTREE" || entry.file_name() == *".MTREE"
|| entry.file_name() == *".PKGINFO" || entry.file_name() == *".PKGINFO"
{ {
continue; return Ok(());
} }
println!("{}", entry.file_name().to_string_lossy());
if entry.file_type()?.is_dir() { if entry.file_type()?.is_dir() {
std::fs::create_dir_all(out.join(entry.path()))?; std::fs::create_dir_all(out.join(entry.path()))?;
for entry in std::fs::read_dir(path.join(entry.path()))? {
(visit_dir.clone().f)(entry, visit_dir.clone())?;
}
} else { } else {
std::fs::create_dir_all(out.join(entry.path().parent().unwrap()))?; std::fs::create_dir_all(out.join(entry.path().parent().unwrap()))?;
std::fs::remove_file(out.join(entry.path()))?; std::fs::remove_file(out.join(entry.path()))?;
std::os::unix::fs::symlink(path.join(entry.path()), out.join(entry.path()))?; std::os::unix::fs::symlink(path.join(entry.path()), out.join(entry.path()))?;
} }
Ok(())
}
};
for entry in std::fs::read_dir(&path)? {
(diritem.clone().f)(entry, diritem.clone())?;
} }
if std::fs::exists(out.join(".INSTALL"))? {
std::os::unix::fs::chroot(&out)?; std::os::unix::fs::chroot(&out)?;
if !std::process::Command::new("/usr/bin/bash") if !std::process::Command::new("/usr/bin/bash")
@ -1116,6 +1133,7 @@ pub fn install_package(
std::os::unix::fs::chroot(".")?; std::os::unix::fs::chroot(".")?;
std::fs::remove_file(out.join(".INSTALL"))?; std::fs::remove_file(out.join(".INSTALL"))?;
}
let mut packages = std::fs::OpenOptions::new() let mut packages = std::fs::OpenOptions::new()
.create(true) .create(true)