From 6d4ddb1c6ee2e771ac8af30a4272dab389652954 Mon Sep 17 00:00:00 2001
From: Matt Russell <matthew.russell@wormbase.org>
Date: Mon, 20 Jun 2016 14:53:24 +0100
Subject: [PATCH 1/2] Back to development.

---
 CHANGES.md  | 3 +++
 project.clj | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5147e99..bf3df19 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -70,3 +70,6 @@
     `phenotype_not_observed` in annotated models (#46)
   - Bug in sort-edn-log.sh - Sort command now uses the temporary sort
     directory.
+
+## 0.4.8-SNAPSHOT - (un-released)
+  - Back to development.
diff --git a/project.clj b/project.clj
index f14a281..846d9ea 100755
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject wormbase/pseudoace "0.4.7"
+(defproject wormbase/pseudoace "0.4.8-SNAPSHOT"
   :dependencies [[clj-time "0.11.0"]
                  [datomic-schema "1.3.0"]
                  [org.clojure/clojure "1.8.0"]

From 665c7093233cd9ad72fc382f18c67d9b23bc39cc Mon Sep 17 00:00:00 2001
From: Matt Russell <matthew.russell@wormbase.org>
Date: Fri, 24 Jun 2016 12:13:06 +0100
Subject: [PATCH 2/2] Fix wrong exit-code when helper.gz is encountered.

`sort-edn-log.sh` should exit with 0 not 1.
---
 CHANGES.md              | 2 +-
 scripts/sort-edn-log.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index bf3df19..232bbdb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -72,4 +72,4 @@
     directory.
 
 ## 0.4.8-SNAPSHOT - (un-released)
-  - Back to development.
+  - Fix wrong exit-code when helper.gz is encountered in `sort-edn-log.sh`.
diff --git a/scripts/sort-edn-log.sh b/scripts/sort-edn-log.sh
index 465e999..aaee735 100755
--- a/scripts/sort-edn-log.sh
+++ b/scripts/sort-edn-log.sh
@@ -12,7 +12,7 @@ fi
 log_filename="$(basename $edn_path)"
 
 if [ "$log_filename" = "helper.edn.gz" ]; then
-    exit 1
+    exit 0
 fi
 
 sorted_filename="$(echo $log_filename | sed 's/.gz$/.sort.gz/')"