Skip to content
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

Jump to bottom

fix shell inconsistency #72

Merged
merged 2 commits into from
Jul 16, 2019
Merged

fix shell inconsistency #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8493e72
fix shell inconsistency
nobody4t Jul 15, 2019
8e23ffb
Merge branch 'master' into fix-shell
swcurran Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/run_postgres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
#!/bin/bash

# on Windows, docker run needs to be prefixed by winpty
if [[ "$OSTYPE" == "msys" ]]; then
if [ "$OSTYPE" == "msys" ]; then
DOCKER="winpty docker"
else
DOCKER=${DOCKER:-docker}
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

cd $(dirname $0)

Expand All @@ -7,7 +7,7 @@ docker build -t aries-cloudagent-test -f ../docker/Dockerfile.test .. || exit 1
if [ ! -d ../test-reports ]; then mkdir ../test-reports; fi

# on Windows, docker run needs to be prefixed by winpty
if [[ "$OSTYPE" == "msys" ]]; then
if [ "$OSTYPE" == "msys" ]; then
DOCKER="winpty docker"
else
DOCKER="docker"
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_tests_indy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

cd $(dirname $0)

Expand All @@ -7,7 +7,7 @@ docker build -t aries-cloudagent-test -f ../docker/Dockerfile.test-indy .. || ex
if [ ! -d ../test-reports ]; then mkdir ../test-reports; fi

# on Windows, docker run needs to be prefixed by winpty
if [[ "$OSTYPE" == "msys" ]]; then
if [ "$OSTYPE" == "msys" ]; then
DOCKER="winpty docker"
else
DOCKER="docker"
Expand Down