diff --git a/assets/var/gnu/linux-kernel.md b/assets/var/gnu/linux-kernel.md index 5665fb9..660989d 100644 --- a/assets/var/gnu/linux-kernel.md +++ b/assets/var/gnu/linux-kernel.md @@ -1,6 +1,6 @@ -linux-kernel 6.18.7 +linux-kernel 7.0.12 = -https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.7.tar.xz +https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.12.tar.xz CONFIG_USB_EHCI_HCD=m CONFIG_USB_OHCI_HCD=m diff --git a/assets/var/trash/docbook.md b/assets/var/trash/docbook.md deleted file mode 100644 index b74f513..0000000 --- a/assets/var/trash/docbook.md +++ /dev/null @@ -1,7 +0,0 @@ -docbook 5.2 -= -https://github.com/docbook/docbook/archive/refs/tags/5.2.tar.gz - -``` cfg *** deps *** -java -``` diff --git a/assets/var/trash/shared-mime-info.md b/assets/var/trash/shared-mime-info.md deleted file mode 100644 index 0506118..0000000 --- a/assets/var/trash/shared-mime-info.md +++ /dev/null @@ -1,15 +0,0 @@ -shared-mime-info 2.4 -= -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.4/shared-mime-info-2.4.tar.gz - -``` sh *** build *** -mkdir -p build -cd build -meson setup --prefix=/pkg/gnu/shared-mime-info --buildtype=release .. -ninja -ninja install -``` - -``` cfg *** build deps *** -docbook -``` diff --git a/src/commands/run/config.rs b/src/commands/run/config.rs index 84a43ed..4ac7118 100644 --- a/src/commands/run/config.rs +++ b/src/commands/run/config.rs @@ -4,7 +4,7 @@ use crate::utils::shell::{run_install_script,run_install_script_hook}; pub fn config(repo: &String, pkgname: &String) { - let src_dir = &crate::commands::get_aeropkg_base().join("src").join(pkgname); + let pkg_dir = &crate::commands::get_aeropkg_base().join(repo).join(pkgname); let pkg_md_path = &crate::commands::get_aeropkg_var().join(format!("{}/{}.md", repo, pkgname)); let config_script = match parser::get_config_script(pkg_md_path) { @@ -13,7 +13,7 @@ pub fn config(repo: &String, pkgname: &String) { }; let full_env = get_install_env(repo, pkgname, pkg_md_path, "config"); - run_install_script(&config_script, src_dir, &full_env); + run_install_script(&config_script, pkg_dir, &full_env); run_install_script_hook(repo, "config", &full_env); link(repo, pkgname) diff --git a/src/commands/run/custom.rs b/src/commands/run/custom.rs index 9fca199..d9f9f9e 100644 --- a/src/commands/run/custom.rs +++ b/src/commands/run/custom.rs @@ -3,10 +3,10 @@ use crate::utils::shell::run_install_script; pub fn custom(scriptname: &String, repo: &String, pkgname: &String) { - let src_dir = &crate::commands::get_aeropkg_base().join("src").join(&pkgname); + let pkg_dir = &crate::commands::get_aeropkg_base().join(repo).join(pkgname); let pkg_md_path = &crate::commands::get_aeropkg_var().join(format!("{}/{}.md", repo, pkgname)); let config_script = &parser::get_custom_script(pkg_md_path, scriptname); let env = &get_custom_env(repo, pkgname, pkg_md_path); - run_install_script(config_script, src_dir, env) + run_install_script(config_script, pkg_dir, env) }