From a78aaa78e487b2499ffd7eed86bac15aa3df0960 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@elliehuxtable.com>
Date: Mon, 26 Feb 2024 10:50:08 +0000
Subject: [PATCH] chore(release): prepare for release v18.0.2

Backporting a fix for bash
---
 CHANGELOG.md                     |  6 ++++++
 Cargo.lock                       | 12 ++++++------
 Cargo.toml                       |  2 +-
 atuin-client/Cargo.toml          |  2 +-
 atuin-server-database/Cargo.toml |  2 +-
 atuin-server-postgres/Cargo.toml |  4 ++--
 atuin-server/Cargo.toml          |  4 ++--
 atuin/Cargo.toml                 |  8 ++++----
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 388478df..c419f694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [18.0.2] - 2024-02-26
+
+### Bug Fixes
+
+- Rework #1509 to recover from the preexec failure ([#1729](https://github.com/atuinsh/atuin/issues/1729))
+
 ## [18.0.1] - 2024-02-12
 
 ### Bug Fixes
diff --git a/Cargo.lock b/Cargo.lock
index 280b16b3..f423d9a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,7 +180,7 @@ dependencies = [
 
 [[package]]
 name = "atuin"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "async-trait",
  "atuin-client",
@@ -223,7 +223,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-client"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "async-trait",
  "atuin-common",
@@ -272,7 +272,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-common"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "eyre",
  "lazy_static",
@@ -288,7 +288,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "argon2",
  "async-trait",
@@ -319,7 +319,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server-database"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "async-trait",
  "atuin-common",
@@ -332,7 +332,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server-postgres"
-version = "18.0.1"
+version = "18.0.2"
 dependencies = [
  "async-trait",
  "atuin-common",
diff --git a/Cargo.toml b/Cargo.toml
index e0cd62e8..adb2ffae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "18.0.1"
+version = "18.0.2"
 authors = ["Ellie Huxtable <ellie@elliehuxtable.com>"]
 rust-version = "1.67"
 license = "MIT"
diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml
index 5aab5195..51227044 100644
--- a/atuin-client/Cargo.toml
+++ b/atuin-client/Cargo.toml
@@ -18,7 +18,7 @@ sync = ["urlencoding", "reqwest", "sha2", "hex"]
 check-update = []
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.0.1" }
+atuin-common = { path = "../atuin-common", version = "18.0.2" }
 
 log = { workspace = true }
 base64 = { workspace = true }
diff --git a/atuin-server-database/Cargo.toml b/atuin-server-database/Cargo.toml
index c5293993..1577f530 100644
--- a/atuin-server-database/Cargo.toml
+++ b/atuin-server-database/Cargo.toml
@@ -10,7 +10,7 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.0.1" }
+atuin-common = { path = "../atuin-common", version = "18.0.2" }
 
 tracing = "0.1"
 time = { workspace = true }
diff --git a/atuin-server-postgres/Cargo.toml b/atuin-server-postgres/Cargo.toml
index 8cfb61e9..a50fbc92 100644
--- a/atuin-server-postgres/Cargo.toml
+++ b/atuin-server-postgres/Cargo.toml
@@ -10,8 +10,8 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.0.1" }
-atuin-server-database = { path = "../atuin-server-database", version = "18.0.1" }
+atuin-common = { path = "../atuin-common", version = "18.0.2" }
+atuin-server-database = { path = "../atuin-server-database", version = "18.0.2" }
 
 tracing = "0.1"
 time = { workspace = true }
diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml
index 987ba9e3..84db5c1a 100644
--- a/atuin-server/Cargo.toml
+++ b/atuin-server/Cargo.toml
@@ -11,8 +11,8 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.0.1" }
-atuin-server-database = { path = "../atuin-server-database", version = "18.0.1" }
+atuin-common = { path = "../atuin-common", version = "18.0.2" }
+atuin-server-database = { path = "../atuin-server-database", version = "18.0.2" }
 
 tracing = "0.1"
 time = { workspace = true }
diff --git a/atuin/Cargo.toml b/atuin/Cargo.toml
index 4941026e..5bea182d 100644
--- a/atuin/Cargo.toml
+++ b/atuin/Cargo.toml
@@ -41,10 +41,10 @@ clipboard = ["cli-clipboard"]
 check-update = ["atuin-client/check-update"]
 
 [dependencies]
-atuin-server-postgres = { path = "../atuin-server-postgres", version = "18.0.1", optional = true }
-atuin-server = { path = "../atuin-server", version = "18.0.1", optional = true }
-atuin-client = { path = "../atuin-client", version = "18.0.1", optional = true, default-features = false }
-atuin-common = { path = "../atuin-common", version = "18.0.1" }
+atuin-server-postgres = { path = "../atuin-server-postgres", version = "18.0.2", optional = true }
+atuin-server = { path = "../atuin-server", version = "18.0.2", optional = true }
+atuin-client = { path = "../atuin-client", version = "18.0.2", optional = true, default-features = false }
+atuin-common = { path = "../atuin-common", version = "18.0.2" }
 
 log = { workspace = true }
 env_logger = "0.10.0"