init.sh fixes for zsh
This commit is contained in:
parent
5bf09d03d0
commit
a2de1641ae
1 changed files with 10 additions and 2 deletions
12
init.sh
12
init.sh
|
|
@ -1,6 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
SCRIPT_FILE=${BASH_SOURCE[0]}
|
||||||
|
[ -n "$SCRIPT_FILE" ] || SCRIPT_FILE=${(%):-%N} # zsh
|
||||||
|
SRCDIR=$(dirname "$(realpath "$SCRIPT_FILE")")
|
||||||
|
|
||||||
SRCDIR=$(dirname "${BASH_SOURCE[0]}")
|
|
||||||
BUILD_DIR=$SRCDIR/build
|
BUILD_DIR=$SRCDIR/build
|
||||||
|
|
||||||
if [[ "${BUILD_DIR:0:2}" == "./" ]]; then
|
if [[ "${BUILD_DIR:0:2}" == "./" ]]; then
|
||||||
|
|
@ -12,7 +14,7 @@ DIST_DIR_TOK='$(FONTDIR)/'
|
||||||
BUILD_TMP_DIR=$BUILD_DIR/tmp
|
BUILD_TMP_DIR=$BUILD_DIR/tmp
|
||||||
VENV_DIR=$BUILD_DIR/venv
|
VENV_DIR=$BUILD_DIR/venv
|
||||||
|
|
||||||
if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
|
if [[ "$SCRIPT_FILE" != "${0}" ]]; then
|
||||||
# sourced
|
# sourced
|
||||||
if [[ -z $VIRTUAL_ENV ]] && [[ ! -f "$VENV_DIR/bin/activate" ]]; then
|
if [[ -z $VIRTUAL_ENV ]] && [[ ! -f "$VENV_DIR/bin/activate" ]]; then
|
||||||
echo "Project not configured." >&2
|
echo "Project not configured." >&2
|
||||||
|
|
@ -24,6 +26,12 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
|
||||||
popd >/dev/null 2>&1
|
popd >/dev/null 2>&1
|
||||||
export PYTHONPATH=$SRCDIR_ABS/misc/tools
|
export PYTHONPATH=$SRCDIR_ABS/misc/tools
|
||||||
fi
|
fi
|
||||||
|
unset SRCDIR
|
||||||
|
unset BUILD_DIR
|
||||||
|
unset SCRIPT_FILE
|
||||||
|
unset DIST_DIR_TOK
|
||||||
|
unset BUILD_TMP_DIR
|
||||||
|
unset VENV_DIR
|
||||||
else
|
else
|
||||||
# Subshell
|
# Subshell
|
||||||
set -e
|
set -e
|
||||||
|
|
|
||||||
Reference in a new issue