Skip to content

Commit 05b144d

Browse files
authored
Use PLATFORMIO_CORE_DIR if set, otherwise default to ${HOME} (#983)
* Use PLATFORMIO_CORE_DIR if set, otherwise default to ${HOME} * Replace tab characters
1 parent d474751 commit 05b144d

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

build.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# CONFIGURATION INI FILE USAGE
77

88
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
9-
PIO_VENV_ROOT="${HOME}/.platformio/penv"
9+
PIO_VENV_ROOT="${PLATFORMIO_CORE_DIR:-${HOME}/.platformio/penv}"
1010
PC_VENV_ROOT="${SCRIPT_DIR}/build/.venv"
1111

1212
BUILD_ALL=0
@@ -197,7 +197,7 @@ MISSING=""
197197
if [ -n "${PC_TARGET}" ] ; then
198198
COMPILER=g++
199199
if [ "$MSYSTEM" = "CLANG64" ]; then
200-
COMPILER=clang++
200+
COMPILER=clang++
201201
fi
202202
for REQUIRED in ${COMPILER} make cmake ; do
203203
if ! command -v ${REQUIRED} > /dev/null ; then
@@ -212,13 +212,13 @@ fi
212212

213213
normalize_path() {
214214
case "$OSTYPE" in
215-
msys*|cygwin*)
216-
cygpath --unix "$1"
217-
;;
218-
*)
219-
# Already Unix-style, return as-is
220-
echo "$1"
221-
;;
215+
msys*|cygwin*)
216+
cygpath --unix "$1"
217+
;;
218+
*)
219+
# Already Unix-style, return as-is
220+
echo "$1"
221+
;;
222222
esac
223223
}
224224

@@ -232,20 +232,20 @@ if [[ "$VIRTUAL_ENV" != "$VENV_ROOT" ]] ; then
232232
source "${ACTIVATE}"
233233
elif [ -f "${ALT_ACTIVATE}" ] ; then
234234
source "${ALT_ACTIVATE}"
235-
echo "-------------------"
236-
cat "${ALT_ACTIVATE}"
237-
echo "-------------------"
235+
echo "-------------------"
236+
cat "${ALT_ACTIVATE}"
237+
echo "-------------------"
238238
fi
239239
VENV_ACTUAL="$(normalize_path "$VIRTUAL_ENV")"
240240
if [[ "${VENV_ACTUAL}" != "${VENV_ROOT}" ]] ; then
241241
echo Unable to activate penv/venv
242-
echo "ACTIVATE = ${ACTIVATE}"
243-
echo "ALT_ACTIVATE = ${ALT_ACTIVATE}"
244-
echo "VIRTAUL_ENV = ${VIRTUAL_ENV}"
245-
echo "VENV_ACTUAL = ${VENV_ACTUAL}"
246-
echo "VENV_ROOT = ${VENV_ROOT}"
247-
ls -Fla "$(dirname ${ACTIVATE})" || true
248-
ls -Fla "$(dirname ${ALT_ACTIVATE})" || true
242+
echo "ACTIVATE = ${ACTIVATE}"
243+
echo "ALT_ACTIVATE = ${ALT_ACTIVATE}"
244+
echo "VIRTAUL_ENV = ${VIRTUAL_ENV}"
245+
echo "VENV_ACTUAL = ${VENV_ACTUAL}"
246+
echo "VENV_ROOT = ${VENV_ROOT}"
247+
ls -Fla "$(dirname ${ACTIVATE})" || true
248+
ls -Fla "$(dirname ${ALT_ACTIVATE})" || true
249249
exit 1
250250
fi
251251
fi

0 commit comments

Comments
 (0)