AeroLinux/AeroPkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update hooks functions

Browse Source
This commit is contained in:
TraceLumen
2026-09-10 23:05:56 +03:00
parent 055ebb7703
commit d2c2daf352
9 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/etc/aeropkg.md
View File

@ -54,3 +54,7 @@ mount_usr_dir
!**
!aeropkg
```
``` sh *** hook ***
```

13
src/commands/download.rs
View File

@ -5,7 +5,8 @@ use std::io::{self, Write};
use std::cell::RefCell;
use super::get_aeropkg_base;
use crate::utils::parser::{self, env::get_install_env, pkginfo, repoinfo};
use crate::utils::parser::{self, env::get_install_env, repoinfo, pkginfo, env::get_custom_env};
use crate::utils::shell;
use crate::commands::link::link;
use crate::commands::run::config::config;
@ -58,11 +59,15 @@ pub fn download_packages(
) {
for pkgname in packages {
let effective_repo = match repo {
Some(r) => r.to_string(),
None => pkginfo::get_priority_repo(pkgname),
Some(r) => &r.to_string(),
None => &pkginfo::get_priority_repo(pkgname),
};
download(&effective_repo, pkgname, force, recursive);
download(effective_repo, pkgname, force, recursive);
let pkg_md_path = &crate::commands::get_aeropkg_var().join(format!("{}/{}.md", effective_repo, pkgname));
let full_env = &get_custom_env(effective_repo, pkgname, pkg_md_path);
shell::run_install_repo_hook_script(effective_repo, full_env);
shell::run_install_hook_script(full_env);
}
}

6
src/commands/install.rs
View File

@ -2,7 +2,8 @@ use std::path::Path;
use std::fs;
use std::os::unix::fs::MetadataExt;
use crate::utils::parser::{self, pkginfo};
use crate::utils::parser::{self, pkginfo, env::get_custom_env};
use crate::utils::shell;
use super::run::download::download;
use super::run::patch::patch;
use super::run::build::build;
@ -22,6 +23,9 @@ pub fn install(repo: &String, pkgname: &String) {
patch(repo, pkgname);
build(repo, pkgname);
config(repo, pkgname);
let full_env = &get_custom_env(repo, pkgname, pkg_md_path);
shell::run_install_repo_hook_script(repo, full_env);
shell::run_install_hook_script(full_env);
}
fn check_build_dependency(repo: &String, pkg_md_path: &Path) {

7
src/commands/run/build.rs
View File

@ -1,7 +1,7 @@
use std::fs;
use crate::commands::link::link;
use crate::utils::parser::{self, env::get_install_env};
use crate::utils::shell::{run_install_script, run_install_script_hook};
use crate::utils::shell::self;
use super::{download, patch};
pub fn build(repo: &String, pkgname: &String) {
@ -38,8 +38,9 @@ pub fn build(repo: &String, pkgname: &String) {
save_env(&applied_env, &full_env);
run_install_script(&build_script, &src_dir, &full_env);
run_install_script_hook(repo, "build", &full_env);
shell::run_install_script(&build_script, &src_dir, &full_env);
shell::run_install_repo_stage_hook_script(repo, "build", &full_env);
shell::run_install_stage_hook_script("download", &full_env);
fs::create_dir_all(&pkg_dir).ok();
fs::write(&applied_build, &build_script).unwrap();

8
src/commands/run/config.rs
View File

@ -1,6 +1,6 @@
use crate::commands::link::link;
use crate::utils::parser::{self, env::get_install_env};
use crate::utils::shell::{run_install_script,run_install_script_hook};
use crate::utils::shell;
pub fn config(repo: &String, pkgname: &String) {
@ -13,8 +13,10 @@ pub fn config(repo: &String, pkgname: &String) {
};
let full_env = get_install_env(repo, pkgname, pkg_md_path, "config");
run_install_script(&config_script, pkg_dir, &full_env);
run_install_script_hook(repo, "config", &full_env);
shell::run_install_script(&config_script, pkg_dir, &full_env);
shell::run_install_repo_stage_hook_script(repo, "config", &full_env);
shell::run_install_stage_hook_script("download", &full_env);
if !crate::commands::get_aeropkg_base().join(repo).join(pkgname).join("disabled").exists() {
link(repo, pkgname)

5
src/commands/run/download.rs
View File

@ -3,7 +3,7 @@ use std::path::Path;
use std::process::{Command, Stdio};
use crate::utils::parser::{self, env::get_install_env};
use crate::utils::shell::run_install_script_hook;
use crate::utils::shell;
pub fn download(repo: &String, pkgname: &String) {
let pkg_md_path = &crate::commands::get_aeropkg_var().join(format!("{}/{}.md", repo, pkgname));
@ -156,7 +156,8 @@ pub fn download(repo: &String, pkgname: &String) {
fs::write(src.join(".aeropkg.download-url"), &url).unwrap();
run_install_script_hook(repo, "download", &full_env)
shell::run_install_repo_stage_hook_script(repo, "download", &full_env);
shell::run_install_stage_hook_script("download", &full_env);
}
fn upload_from_repo(repo: &String, pkgname: &String, pkg_md_path: &Path) {

8
src/commands/run/patch.rs
View File

@ -1,7 +1,7 @@
use std::fs;
use crate::utils::parser::{self, env::get_install_env};
use crate::utils::shell::{run_install_script,run_install_script_hook};
use crate::utils::shell;
use super::download::download;
pub fn patch(repo: &String, pkgname: &String) {
@ -21,7 +21,9 @@ pub fn patch(repo: &String, pkgname: &String) {
}
let full_env = get_install_env(repo, pkgname, pkg_md_path, "patch");
run_install_script(patch_script, src, &full_env);
run_install_script_hook(repo, "patch", &full_env);
shell::run_install_script(patch_script, src, &full_env);
shell::run_install_repo_stage_hook_script(repo, "patch", &full_env);
shell::run_install_stage_hook_script("download", &full_env);
fs::write(src.join(".aeropkg.applied-patch"), &patch_script).unwrap()
}

4
src/utils/parser/mod.rs
View File

@ -6,6 +6,10 @@ use std::fs;
use std::io::{self, BufRead};
use std::path::Path;
pub fn get_general_hook() -> io::Result<String> {
let cfg_path = &crate::commands::get_aeropkg_etc().join("aeropkg.md");
extract_block(cfg_path, &format!("``` sh *** hook ***"), "```")
}
pub fn get_stage_hook(stage: &str) -> io::Result<String> {
let cfg_path = &crate::commands::get_aeropkg_etc().join("aeropkg.md");

48
src/utils/shell.rs
View File

@ -68,7 +68,7 @@ pub fn shell_update() {
if !output_ldconfig.status.success() { panic!("ldconfig failed: {}", String::from_utf8_lossy(&output_ldconfig.stderr)) }
}
pub fn run_install_script_hook(repo: &str, stage: &str, full_env: &HashMap<String, String>) {
pub fn run_install_repo_stage_hook_script(repo: &str, stage: &str, full_env: &HashMap<String, String>) {
let hook_script = match parser::get_repo_and_stage_hook(repo, stage) {
Ok(script) => Ok(script),
Err(_) => parser::get_stage_hook(stage)
@ -89,6 +89,52 @@ pub fn run_install_script_hook(repo: &str, stage: &str, full_env: &HashMap<Strin
}
}
pub fn run_install_repo_hook_script(repo: &str, full_env: &HashMap<String, String>) {
run_install_stage_hook_script(repo, full_env);
}
pub fn run_install_stage_hook_script(stage: &str, full_env: &HashMap<String, String>) {
let hook_script = match parser::get_stage_hook(stage) {
Ok(script) => Ok(script),
Err(_) => parser::get_stage_hook(stage)
};
let shell = env::var("SHELL").unwrap_or_else(|_| "/bin/sh".to_string());
if let Ok(script) = hook_script {
let output = Command::new(&shell)
.arg("-c")
.arg(format!("set -e\n{}", script))
.envs(full_env)
.output();
if let Err(e) = output { panic!("Failed to execute hook script: {}", e) }
let output = output.unwrap();
if !output.status.success() { panic!("Hook script failed: {:?}", output) }
}
}
pub fn run_install_hook_script(full_env: &HashMap<String, String>) {
let hook_script = match parser::get_general_hook() {
Ok(script) => Ok(script),
Err(_) => parser::get_general_hook()
};
let shell = env::var("SHELL").unwrap_or_else(|_| "/bin/sh".to_string());
if let Ok(script) = hook_script {
let output = Command::new(&shell)
.arg("-c")
.arg(format!("set -e\n{}", script))
.envs(full_env)
.output();
if let Err(e) = output { panic!("Failed to execute hook script: {}", e) }
let output = output.unwrap();
if !output.status.success() { panic!("Hook script failed: {:?}", output) }
}
}
pub fn run_install_script(script: &str, work_dir: &Path, full_env: &HashMap<String, String>) {
let shell = env::var("SHELL").unwrap_or_else(|_| "/bin/sh".to_string());