Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Support bash in devenv scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
hnakamur committed Mar 28, 2019
1 parent 21b5b08 commit 0b643e1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config.inc
@@ -1,6 +1,6 @@
#! /bin/sh

HOST_BASE_PREFIX=${HOST_BASE_PREFIX:-$(cd "$(dirname ${0})" && pwd)}
HOST_BASE_PREFIX=${HOST_BASE_PREFIX:-$(cd "$(dirname ${BASH_SOURCE:-$0})" && pwd)}
if [ ! -x "${HOST_BASE_PREFIX}/helpers/install.sh" ]; then
echo "Unable to find the current script base directory" >&2
exit 1
Expand Down
2 changes: 1 addition & 1 deletion devenv_build_container.sh
@@ -1,6 +1,6 @@
#!/bin/sh

. "$(dirname ${0})/config.inc"
. "$(dirname ${BASH_SOURCE:-$0})/config.inc"

if docker image inspect lucet-dev:latest > /dev/null; then
if [ -z "$DEVENV_FORCE_REBUILD" ]; then
Expand Down
2 changes: 1 addition & 1 deletion devenv_run.sh
@@ -1,6 +1,6 @@
#!/bin/sh

. "$(dirname ${0})/config.inc"
. "$(dirname ${BASH_SOURCE:-$0})/config.inc"

if ! docker ps -f name=lucet | grep -Fq lucet ; then
${HOST_BASE_PREFIX}/devenv_start.sh
Expand Down
2 changes: 1 addition & 1 deletion devenv_setenv.sh
@@ -1,6 +1,6 @@
#!/bin/sh

. $(dirname ${0})/config.inc
. $(dirname ${BASH_SOURCE:-$0})/config.inc

if ! "$HOST_RUN" true ; then
echo "Unable to run commands in the container" >&2
Expand Down
2 changes: 1 addition & 1 deletion devenv_start.sh
@@ -1,6 +1,6 @@
#!/bin/sh

. "$(dirname ${0})/config.inc"
. "$(dirname ${BASH_SOURCE:-$0})/config.inc"

if ! docker image inspect lucet-dev:latest > /dev/null; then
${HOST_BASE_PREFIX}/devenv_build_container.sh
Expand Down
4 changes: 2 additions & 2 deletions devenv_stop.sh
@@ -1,9 +1,9 @@
#!/bin/sh

. "$(dirname ${0})/config.inc"
. "$(dirname ${BASH_SOURCE:-$0})/config.inc"

echo "Stopping container"
docker stop lucet

echo "Removing container"
docker rm lucet
docker rm lucet

0 comments on commit 0b643e1

Please sign in to comment.