MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-25 22:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use redoxer::target directly for clarity

Browse Source
This commit is contained in:
Jeremy Soller 2025-11-20 12:41:21 -07:00
parent 9958be688c
commit 12f1f1701f
No known key found for this signature in database
GPG Key ID: 670FDFB5428E05CA
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/repo.rs
View File

@ -19,7 +19,6 @@ use ratatui::style::{Color, Style};
use ratatui::text::{Line, Span, Text};
use ratatui::widgets::{Block, Borders, Clear, List, ListItem, ListState, Paragraph, Wrap};
use redox_installer::PackageConfig;
use redoxer::target;
use std::borrow::Cow;
use std::collections::{HashMap, HashSet, VecDeque};
use std::io::{Read, Write, stderr, stdin, stdout};
@ -661,7 +660,7 @@ fn handle_push(recipes: &Vec<CookRecipe>, config: &CliConfig) -> anyhow::Result<
for (i, root) in roots.iter().enumerate() {
let archive_path = config
.repo_dir
.join(target())
.join(redoxer::target())
.join(format!("{}.pkgar", root.name));
let metadata = std::fs::metadata(&archive_path);
handle_push_inner(

3
src/cook/cook_build.rs
View File

@ -1,6 +1,5 @@
use pkg::package::PackageError;
use pkg::{Package, PackageName};
use redoxer::target;
use crate::cook::fs::*;
use crate::cook::pty::PtyOut;
@ -411,7 +410,7 @@ fn build_auto_deps(
}
fn get_remote_url(name: &PackageName, ext: &str) -> String {
return format!("{}/{}/{}.{}", REMOTE_PKG_SOURCE, target(), name, ext);
return format!("{}/{}/{}.{}", REMOTE_PKG_SOURCE, redoxer::target(), name, ext);
}
fn get_pubkey_url() -> String {
return format!("{}/id_ed25519.pub.toml", REMOTE_PKG_SOURCE);