mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 12:11:56 +00:00
pack compressed assets into single binary (#2344)
* pack compressed assets into single binary * update naming * tweaks * fix build * fix cargo lock * rename CLI * remove explicit ref name
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use std::{path::Path, process::Stdio};
|
||||
|
||||
use embassy::disk::main::DEFAULT_PASSWORD;
|
||||
use startos::disk::main::DEFAULT_PASSWORD;
|
||||
|
||||
pub fn create_backup(
|
||||
mountpoint: impl AsRef<Path>,
|
||||
@@ -19,17 +19,21 @@ pub fn create_backup(
|
||||
let mut data_cmd = std::process::Command::new("duplicity");
|
||||
for exclude in exclude.lines().map(|s| s.trim()).filter(|s| !s.is_empty()) {
|
||||
if exclude.to_string().starts_with('!') {
|
||||
data_cmd.arg(format!(
|
||||
"--include={}",
|
||||
data_path
|
||||
.join(exclude.to_string().trim_start_matches('!'))
|
||||
.display()
|
||||
)).arg("--allow-source-mismatch");
|
||||
data_cmd
|
||||
.arg(format!(
|
||||
"--include={}",
|
||||
data_path
|
||||
.join(exclude.to_string().trim_start_matches('!'))
|
||||
.display()
|
||||
))
|
||||
.arg("--allow-source-mismatch");
|
||||
} else {
|
||||
data_cmd.arg(format!(
|
||||
"--exclude={}",
|
||||
data_path.join(exclude.to_string()).display()
|
||||
)).arg("--allow-source-mismatch");
|
||||
data_cmd
|
||||
.arg(format!(
|
||||
"--exclude={}",
|
||||
data_path.join(exclude.to_string()).display()
|
||||
))
|
||||
.arg("--allow-source-mismatch");
|
||||
}
|
||||
}
|
||||
let data_output = data_cmd
|
||||
|
||||
@@ -3,11 +3,11 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
|
||||
use std::path::Path;
|
||||
|
||||
use beau_collector::BeauCollector;
|
||||
use embassy::config::action::SetResult;
|
||||
use embassy::config::{spec, Config};
|
||||
use embassy::s9pk::manifest::PackageId;
|
||||
use embassy::status::health_check::HealthCheckId;
|
||||
use linear_map::LinearMap;
|
||||
use startos::config::action::SetResult;
|
||||
use startos::config::{spec, Config};
|
||||
use startos::s9pk::manifest::PackageId;
|
||||
use startos::status::health_check::HealthCheckId;
|
||||
|
||||
pub mod rules;
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ use pest::Parser;
|
||||
use rand::SeedableRng;
|
||||
use serde_json::Value;
|
||||
|
||||
use embassy::config::util::STATIC_NULL;
|
||||
use embassy::config::Config;
|
||||
use startos::config::util::STATIC_NULL;
|
||||
use startos::config::Config;
|
||||
|
||||
#[derive(Parser)]
|
||||
#[grammar = "config/rule_parser.pest"]
|
||||
|
||||
@@ -19,8 +19,8 @@ use clap::{App, Arg, SubCommand};
|
||||
use config::{
|
||||
apply_dependency_configuration, validate_configuration, validate_dependency_configuration,
|
||||
};
|
||||
use embassy::config::action::ConfigRes;
|
||||
use serde_json::json;
|
||||
use startos::config::action::ConfigRes;
|
||||
|
||||
const PROPERTIES_FALLBACK_MESSAGE: &str =
|
||||
"Could not find properties. The service might still be starting";
|
||||
|
||||
Reference in New Issue
Block a user