Merge branch 'develop'

WormBase · Jun 24, 2016 · 6274c18 · 6274c18
2 parents d0bd49e + 665c709
commit 6274c18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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)
+  - Fix wrong exit-code when helper.gz is encountered in `sort-edn-log.sh`.
diff --git 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"]

diff --git 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/')"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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/')"
@@ Expand Down @@