summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-11-26 14:50:09 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-11-26 14:50:09 +0100
commit33e19b651309b75899804b49ae25857aa00cb301 (patch)
tree9354bc9cbd5c8d530dd81f7f97a817c88ce0fa1b
parenteecd7b291c779cf34508687a586b58ca39239b67 (diff)
Fix: Repo path should be cwd, not configurable
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--config.toml3
-rw-r--r--examples/packages/example_1/config.toml3
-rw-r--r--examples/packages/example_2/config.toml1
-rw-r--r--examples/packages/example_3/config.toml1
-rw-r--r--examples/packages/example_tmux/config.toml1
-rw-r--r--src/config/not_validated.rs3
-rw-r--r--src/main.rs2
7 files changed, 1 insertions, 13 deletions
diff --git a/config.toml b/config.toml
index add5c22..458bf13 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,3 @@
-# repository of package definitions
-repository = "/tmp/path"
-
# Format of the progress bars used.
# See https://docs.rs/indicatif/0.15.0/indicatif/#templates
# for how to customize this.
diff --git a/examples/packages/example_1/config.toml b/examples/packages/example_1/config.toml
index 25d5401..3c5da57 100644
--- a/examples/packages/example_1/config.toml
+++ b/examples/packages/example_1/config.toml
@@ -1,8 +1,5 @@
# Configuration file for BUTIDO for this repository
-# repository of package definitions
-repository = "/tmp/butido_example_1"
-
releases = "/tmp/butido-releases"
staging = "/tmp/butido-staging"
source_cache = "/tmp/butido-sources"
diff --git a/examples/packages/example_2/config.toml b/examples/packages/example_2/config.toml
index 1ae3a6f..9d7aeb2 100644
--- a/examples/packages/example_2/config.toml
+++ b/examples/packages/example_2/config.toml
@@ -1,7 +1,6 @@
# Configuration file for BUTIDO for this repository
# repository of package definitions
-repository = "/tmp/butido_example_2"
releases = "/dev/null"
staging = "/dev/null"
diff --git a/examples/packages/example_3/config.toml b/examples/packages/example_3/config.toml
index 73777aa..fc0244b 100644
--- a/examples/packages/example_3/config.toml
+++ b/examples/packages/example_3/config.toml
@@ -1,7 +1,6 @@
# Configuration file for BUTIDO for this repository
# repository of package definitions
-repository = "/tmp/example-3-repo"
releases = "/tmp/example-3-releases"
staging = "/tmp/example-3-staging"
source_cache = "/tmp/example-3-sources"
diff --git a/examples/packages/example_tmux/config.toml b/examples/packages/example_tmux/config.toml
index 0977015..d86ea96 100644
--- a/examples/packages/example_tmux/config.toml
+++ b/examples/packages/example_tmux/config.toml
@@ -1,7 +1,6 @@
# Configuration file for BUTIDO for this repository
# repository of package definitions
-repository = "/tmp/tmux-repo"
releases = "/tmp/tmux-releases"
staging = "/tmp/tmux-staging"
source_cache = "/tmp/tmux-sources"
diff --git a/src/config/not_validated.rs b/src/config/not_validated.rs
index b3f9f8a..200b1e4 100644
--- a/src/config/not_validated.rs
+++ b/src/config/not_validated.rs
@@ -14,9 +14,6 @@ use crate::phase::PhaseName;
#[derive(Debug, Getters, Deserialize)]
pub struct NotValidatedConfiguration {
#[getset(get = "pub")]
- repository: PathBuf,
-
- #[getset(get = "pub")]
log_dir: PathBuf,
#[serde(default = "default_progress_format")]
diff --git a/src/main.rs b/src/main.rs
index bedef51..7aed75f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ async fn main() -> Result<()> {
//
let config: Configuration = config.try_into::<NotValidatedConfiguration>()?.validate()?;
- let repo_path = PathBuf::from(config.repository());
+ let repo_path = PathBuf::from(".");
let _ = crate::ui::package_repo_cleanness_check(&repo_path)?;
let max_packages = count_pkg_files(&repo_path);
let hide_bars = cli.is_present("hide_bars") || crate::util::stdout_is_pipe();