Skip to content

Commit

Permalink
Merge pull request #23 from AOSC-Dev/do-not-symlink-ab3cfg.sh
Browse files Browse the repository at this point in the history
feat: do not symlink `ab3cfg.sh`
  • Loading branch information
eatradish authored Aug 10, 2024
2 parents d0e0ae2 + 753cead commit e9c5b05
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::{

const DEFAULT_CONFIG_LOCATION: &str = ".ciel/data/config.toml";
const DEFAULT_APT_SOURCE: &str = "deb https://repo.aosc.io/debs/ stable main";
const DEFAULT_AB3_CONFIG_FILE: &str = "ab3cfg.sh";
const DEFAULT_AB4_CONFIG_FILE: &str = "ab4cfg.sh";
const DEFAULT_AB4_CONFIG_LOCATION: &str = "etc/autobuild/ab4cfg.sh";
const DEFAULT_APT_LIST_LOCATION: &str = "etc/apt/sources.list";
const DEFAULT_RESOLV_LOCATION: &str = "etc/systemd/resolved.conf";
Expand Down Expand Up @@ -213,9 +213,7 @@ pub fn apply_config<P: AsRef<Path>>(root: P, config: &CielConfig) -> Result<()>
)
.as_bytes(),
)?;
config_path.set_file_name(DEFAULT_AB3_CONFIG_FILE);
// compatibility with autobuild3
std::os::unix::fs::symlink("ab4cfg.sh", &config_path)?;
config_path.set_file_name(DEFAULT_AB4_CONFIG_FILE);
// write sources.list
if !config.apt_sources.is_empty() {
let mut apt_list_path = rootfs.to_owned();
Expand Down

0 comments on commit e9c5b05

Please sign in to comment.