summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2020-08-25 20:09:12 -0700
committerBryan Newbold <bnewbold@archive.org>2020-08-25 20:10:07 -0700
commitbdaf45ff85076cec93b68cd45c018bc02e2fa67e (patch)
treecae9206aa377fc5accc87f3aaaa10d627b5b8da4
parent0e1d7e4758cbff5f92b17ff93e67b76478cb8bd5 (diff)
downloades-public-proxy-bdaf45ff85076cec93b68cd45c018bc02e2fa67e.tar.gz
es-public-proxy-bdaf45ff85076cec93b68cd45c018bc02e2fa67e.zip
declutter top-level files into extra/
-rw-r--r--Cargo.toml4
-rw-r--r--Makefile6
-rw-r--r--extra/es-public-proxy.1 (renamed from es-public-proxy.1)0
-rw-r--r--extra/es-public-proxy.1.scdoc (renamed from es-public-proxy.1.scdoc)0
-rw-r--r--extra/example_config.toml (renamed from example_config.toml)0
-rw-r--r--src/main.rs2
6 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.toml b/Cargo.toml
index ca04f6b..cc3fa5b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,6 +33,6 @@ section = "utility"
priority = "optional"
assets = [
["target/release/es-public-proxy", "usr/bin/", "755"],
- ["es-public-proxy.1", "usr/share/man/man1/", "644"],
- ["example_config.toml", "usr/share/doc/es-public-proxy/", "644"],
+ ["extra/es-public-proxy.1", "usr/share/man/man1/", "644"],
+ ["extra/example_config.toml", "usr/share/doc/es-public-proxy/", "644"],
]
diff --git a/Makefile b/Makefile
index 41c4217..de2d568 100644
--- a/Makefile
+++ b/Makefile
@@ -26,11 +26,11 @@ fmt: ## Run syntax re-formatting
build: ## Build (debug)
cargo build
-es-public-proxy.1: es-public-proxy.1.scdoc
- scdoc < es-public-proxy.1.scdoc > es-public-proxy.1
+extra/es-public-proxy.1: extra/es-public-proxy.1.scdoc
+ scdoc < extra/es-public-proxy.1.scdoc > extra/es-public-proxy.1
.PHONY: manpage
-manpage: es-public-proxy.1 ## Rebuild manpage using scdoc
+manpage: extra/es-public-proxy.1 ## Rebuild manpage using scdoc
.PHONY: deb
deb: ## Build debian packages (.deb files)
diff --git a/es-public-proxy.1 b/extra/es-public-proxy.1
index ee12f43..ee12f43 100644
--- a/es-public-proxy.1
+++ b/extra/es-public-proxy.1
diff --git a/es-public-proxy.1.scdoc b/extra/es-public-proxy.1.scdoc
index 00104d9..00104d9 100644
--- a/es-public-proxy.1.scdoc
+++ b/extra/es-public-proxy.1.scdoc
diff --git a/example_config.toml b/extra/example_config.toml
index cd66403..cd66403 100644
--- a/example_config.toml
+++ b/extra/example_config.toml
diff --git a/src/main.rs b/src/main.rs
index 90161ad..d95ef4a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -76,7 +76,7 @@ fn load_config() -> ProxyConfig {
std::process::exit(0);
}
[_, "--example-config"] => {
- println!("{}", include_str!("../example_config.toml"));
+ println!("{}", include_str!("../extra/example_config.toml"));
std::process::exit(0);
}
[_, "--config", p] => config_path = Some(p.to_string()),