4 Commits

Author SHA1 Message Date
63d04a9393 chore: release v0.4.2 2026-03-02 14:51:03 +01:00
f92227a679 chore: generalize build.sh 2026-03-02 14:50:43 +01:00
27a1ec6d2c chore(release): v0.4.1 2026-02-26 17:45:58 -05:00
1b1f9a31ed feat: add -L to docker cp 2026-02-26 17:45:28 -05:00
4 changed files with 9 additions and 7 deletions

2
Cargo.lock generated
View File

@@ -4,7 +4,7 @@ version = 4
[[package]] [[package]]
name = "ahab" name = "ahab"
version = "0.4.0" version = "0.4.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",

View File

@@ -2,7 +2,7 @@
name = "ahab" name = "ahab"
description = "docker cli wrapper" description = "docker cli wrapper"
readme = "README.md" readme = "README.md"
version = "0.4.0" version = "0.4.2"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = ["Matej Janežič <janezic.mj@gmail.com>"] authors = ["Matej Janežič <janezic.mj@gmail.com>"]

View File

@@ -5,15 +5,17 @@ use std::{env, io::Error};
include!("src/cli/mod.rs"); include!("src/cli/mod.rs");
fn main() -> Result<(), Error> { fn main() -> Result<(), Error> {
let outdir = match env::var_os("OUT_DIR") { let outdir = env::var_os("SHELL_COMPLETIONS_DIR")
None => return Ok(()), .or_else(|| env::var_os("OUT_DIR"));
Some(outdir) => outdir,
let Some(outdir) = outdir else {
return Ok(());
}; };
let mut cmd = ahab::Ahab::command(); let mut cmd = ahab::Ahab::command();
for shell in Shell::value_variants() { 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:?}"); println!("cargo:warning=completion file is generated: {path:?}");
} }

View File

@@ -48,7 +48,7 @@ pub fn import(container: &str, file: &Path) -> Result<()> {
eprintln!("restoring database"); eprintln!("restoring database");
let commands = [ 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} dropdb -U db db"),
format!("exec {db_container} createdb -U db -E utf8 -T template0 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"), format!("exec {db_container} pg_restore -U db --dbname=db /tmp/dbdump"),