Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
63d04a9393
|
|||
|
f92227a679
|
|||
|
27a1ec6d2c
|
|||
|
1b1f9a31ed
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -4,7 +4,7 @@ version = 4
|
||||
|
||||
[[package]]
|
||||
name = "ahab"
|
||||
version = "0.4.0"
|
||||
version = "0.4.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
name = "ahab"
|
||||
description = "docker cli wrapper"
|
||||
readme = "README.md"
|
||||
version = "0.4.0"
|
||||
version = "0.4.2"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Matej Janežič <janezic.mj@gmail.com>"]
|
||||
|
||||
10
build.rs
10
build.rs
@@ -5,15 +5,17 @@ use std::{env, io::Error};
|
||||
include!("src/cli/mod.rs");
|
||||
|
||||
fn main() -> Result<(), Error> {
|
||||
let outdir = match env::var_os("OUT_DIR") {
|
||||
None => return Ok(()),
|
||||
Some(outdir) => outdir,
|
||||
let outdir = env::var_os("SHELL_COMPLETIONS_DIR")
|
||||
.or_else(|| env::var_os("OUT_DIR"));
|
||||
|
||||
let Some(outdir) = outdir else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let mut cmd = ahab::Ahab::command();
|
||||
|
||||
for shell in Shell::value_variants() {
|
||||
let path = generate_to(*shell, &mut cmd, "ahab", &outdir)?;
|
||||
let path = generate_to(*shell, &mut cmd, env!("CARGO_PKG_NAME"), &outdir)?;
|
||||
|
||||
println!("cargo:warning=completion file is generated: {path:?}");
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ pub fn import(container: &str, file: &Path) -> Result<()> {
|
||||
|
||||
eprintln!("restoring database");
|
||||
let commands = [
|
||||
format!("cp {dump_file} {db_container}:/tmp/dbdump"),
|
||||
format!("cp -L {dump_file} {db_container}:/tmp/dbdump"),
|
||||
format!("exec {db_container} dropdb -U db db"),
|
||||
format!("exec {db_container} createdb -U db -E utf8 -T template0 db"),
|
||||
format!("exec {db_container} pg_restore -U db --dbname=db /tmp/dbdump"),
|
||||
|
||||
Reference in New Issue
Block a user