Fix DIR issues
commitc11012dcbf98dcb045b8516e0f42197eff7a9465
authorJulian K. Arni <jkarni@gmail.com>
dateFri 5 Jun 2015, 15:08 (11 years ago)
parent0c52b23
scripts/lib/common.sh+1−1
@@ -10,7 +10,7 @@
1010#===============================================================================
1111
1212
13−DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
13+DIR=$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
1414DRY_RUN=false
1515POSITION="none"
1616SOURCES_TXT="$( dirname $DIR)/sources.txt"
scripts/start-sandbox.sh+2−1
@@ -13,7 +13,8 @@
1313set -o nounset
1414set -o errexit
1515
16−. lib/common.sh
16+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
17+. "$DIR"/lib/common.sh
1718
1819prepare_sandbox () {
1920 $CABAL sandbox init
scripts/test-all.sh+4−1
@@ -14,7 +14,10 @@
1414set -o nounset
1515set -o errexit
1616
17−. lib/common.sh
17+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
18+. "$DIR"/lib/common.sh
19+
20+GHC_FLAGS="-Werror"
1821
1922prepare_sandbox () {
2023 $CABAL sandbox init
scripts/update-defaults-nix.sh+2−1
@@ -11,7 +11,8 @@
1111set -o nounset
1212set -o errexit
1313
14−. lib/common.sh
14+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
15+. "$DIR"/lib/common.sh
1516
1617for s in ${SOURCES[@]} ; do
1718 echo $s
scripts/upload.sh+2−1
@@ -15,7 +15,8 @@
1515set -o nounset
1616set -o errexit
1717
18−. lib/common.sh
18+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
19+. "$DIR"/lib/common.sh
1920
2021usage () {
2122 echo " upload.sh <USER> <PASSWORD>"