Skip to content

Commit 31eb2ae

Browse files
authored
Merge pull request #13 from bertsky/bash-from-env
use bash from env instead of fixed path, check version
2 parents 8a907a6 + d3eee43 commit 31eb2ae

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ Change Log
22
==========
33
Versioned according to [Semantic Versioning](http://semver.org/).
44

5+
## Unreleased
6+
7+
## 0.0.3
8+
9+
Changed:
10+
11+
- Use bash from env instead of fixed shebang
12+
- Ensure minimum bash version
13+
14+
515
## 0.0.2
616

717
First release

ocrd-im6convert

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# shellcheck disable=SC2086
33

44
set -eu
55
set -o pipefail
66

7-
which ocrd >/dev/null 2>/dev/null || { echo "ocrd not in \$PATH. Panicking"; exit 1; }
7+
which ocrd >/dev/null 2>/dev/null || { echo >&2 "ocrd not in \$PATH. Panicking"; exit 1; }
8+
((BASH_VERSINFO<4 || BASH_VERSINFO==4 && BASH_VERSINFO[1]<4)) && echo >&2 "bash $BASH_VERSION is too old. Please install bash 4.4 or newer." && exit 1
89

910
SHAREDIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
1011

ocrd-tool.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"git_url": "https://github.com/OCR-D/ocrd_im6convert",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"tools": {
55

66
"ocrd-im6convert": {

0 commit comments

Comments
 (0)