Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 0 insertions, 22 deletions

diff --git a/spec/lib/external_command_scripts/output.sh b/spec/lib/external_command_scripts/output.sh
deleted file mode 100755
index 0472c89a3..000000000
--- a/spec/lib/external_command_scripts/output.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-out_msg=${1:-out}
-err_msg=${2:-}
-repeats=${3:-10}
-exit_status=${4:-0}
-
-n=0
-while [ "$n" -lt "$repeats" ]
-do
-  if [ -n "$out_msg" ]
-  then
-    echo "$out_msg $n"
-  fi
-  if [ -n "$err_msg" ]
-  then
-    echo >&2 "$err_msg $n"
-  fi
-  n=$[$n + 1]
-done
-
-exit "$exit_status"