Skip to content

use bash from env instead of fixed path, check version #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bertsky merged 3 commits into from
Feb 20, 2020
Merged

use bash from env instead of fixed path, check version #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7085d94
use bash from env instead of fixed path, check version
Feb 20, 2020
c99e902
fix bash version check (major vs minor)
bertsky Feb 20, 2020
d3eee43
:package: v0.0.3
Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@ Change Log
==========
Versioned according to [Semantic Versioning](http://semver.org/).

## Unreleased

## 0.0.3

Changed:

- Use bash from env instead of fixed shebang
- Ensure minimum bash version


## 0.0.2

First release
Expand Down
5 changes: 3 additions & 2 deletions ocrd-im6convert
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash
#!/usr/bin/env bash
# shellcheck disable=SC2086

set -eu
set -o pipefail

which ocrd >/dev/null 2>/dev/null || { echo "ocrd not in \$PATH. Panicking"; exit 1; }
which ocrd >/dev/null 2>/dev/null || { echo >&2 "ocrd not in \$PATH. Panicking"; exit 1; }
((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

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

Expand Down
2 changes: 1 addition & 1 deletion ocrd-tool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"git_url": "https://github.com/OCR-D/ocrd_im6convert",
"version": "0.0.2",
"version": "0.0.3",
"tools": {

"ocrd-im6convert": {
Expand Down