Skip to content

Commit

Permalink
Move bash arguments to top of scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
bramwelt committed Jul 29, 2014
1 parent 4846480 commit 2dddb7f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
all: test

test: bootstrap
bash -ex ./scripts/test.sh
bash ./scripts/test.sh

bootstrap:
bash -ex ./scripts/bootstrap.sh
bash ./scripts/bootstrap.sh

install: bootstrap
bash -ex ./scripts/install.sh
bash ./scripts/install.sh

lint:
bash -ex ./scripts/lint.sh
bash ./scripts/lint.sh

clean:
bash ./scripts/clean.sh
Expand All @@ -25,7 +25,7 @@ breakpad:
PREFIX=`pwd`/stackwalk/ SKIP_TAR=1 ./scripts/build-breakpad.sh

json_enhancements_pg_extension: bootstrap
bash -e ./scripts/json-enhancements.sh
bash ./scripts/json-enhancements.sh

stackwalker:
# Build JSON stackwalker
Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/bash -ex

export VIRTUAL_ENV=${VIRTUAL_ENV:-"$PWD/socorro-virtualenv"}

Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/bash -ex

export PREFIX=${PREFIX:-/data/socorro}

Expand Down
2 changes: 1 addition & 1 deletion scripts/json-enhancements.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/bash -e

# This is only run manually, as it is a one-time operation
# to be performed at system installation time, rather than
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/bash -ex

rm -f pylint.txt
pylint -f parseable --rcfile=pylintrc socorro > pylint.txt
2 changes: 1 addition & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/bash -ex

NOSE="$VIRTUAL_ENV/bin/nosetests socorro -s"
SETUPDB="$VIRTUAL_ENV/bin/python ./socorro/external/postgresql/setupdb_app.py"
Expand Down

0 comments on commit 2dddb7f

Please sign in to comment.