mirror of https://github.com/rusefi/rusefi.git
change grealpath check
This commit is contained in:
parent
6792783237
commit
de98d30520
|
@ -142,7 +142,8 @@ runs:
|
||||||
echo "RUN_SIMULATOR=${{toJSON(inputs.run_simulator)}}" >> $GITHUB_ENV
|
echo "RUN_SIMULATOR=${{toJSON(inputs.run_simulator)}}" >> $GITHUB_ENV
|
||||||
echo "REF=${{github.ref_name}}" >> $GITHUB_ENV
|
echo "REF=${{github.ref_name}}" >> $GITHUB_ENV
|
||||||
echo "${{ inputs.ADDITIONAL_ENV }}" >> $GITHUB_ENV
|
echo "${{ inputs.ADDITIONAL_ENV }}" >> $GITHUB_ENV
|
||||||
which realpath >/dev/null 2>&1 || (which grealpath >/dev/null 2>&1 && alias realpath='grealpath')
|
shopt -s expand_aliases
|
||||||
|
if which grealpath >/dev/null 2>&1; then alias realpath='grealpath'; fi
|
||||||
echo "META_OUTPUT_ROOT_FOLDER=$(realpath --relative-to=${{inputs.rusefi_dir}}/firmware ${{inputs.meta_output}})/" >> $GITHUB_ENV
|
echo "META_OUTPUT_ROOT_FOLDER=$(realpath --relative-to=${{inputs.rusefi_dir}}/firmware ${{inputs.meta_output}})/" >> $GITHUB_ENV
|
||||||
echo "SIM_OUTPUT_ROOT_FOLDER=$(realpath --relative-to=${{inputs.rusefi_dir}}/firmware ${{inputs.sim_output}})/" >> $GITHUB_ENV
|
echo "SIM_OUTPUT_ROOT_FOLDER=$(realpath --relative-to=${{inputs.rusefi_dir}}/firmware ${{inputs.sim_output}})/" >> $GITHUB_ENV
|
||||||
source ${{inputs.rusefi_dir}}/firmware/config/boards/common_script_read_meta_env.inc "${{inputs.meta_info}}"
|
source ${{inputs.rusefi_dir}}/firmware/config/boards/common_script_read_meta_env.inc "${{inputs.meta_info}}"
|
||||||
|
|
|
@ -4,7 +4,8 @@ BOARD_DIR=${1:-$BOARD_DIR}
|
||||||
SHORT_BOARD_NAME=${2:-$SHORT_BOARD_NAME}
|
SHORT_BOARD_NAME=${2:-$SHORT_BOARD_NAME}
|
||||||
INI=${3:-"rusefi_$SHORT_BOARD_NAME.ini"}
|
INI=${3:-"rusefi_$SHORT_BOARD_NAME.ini"}
|
||||||
|
|
||||||
which realpath >/dev/null 2>&1 || (which grealpath >/dev/null 2>&1 && alias realpath='grealpath')
|
shopt -s expand_aliases
|
||||||
|
if which grealpath >/dev/null 2>&1; then alias realpath='grealpath'; fi
|
||||||
FDIR=$(realpath $(dirname "$0")/..)
|
FDIR=$(realpath $(dirname "$0")/..)
|
||||||
BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR")
|
BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR")
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@ fi
|
||||||
|
|
||||||
echo "BOARD_DIR=${BOARD_DIR} SHORT_BOARD_NAME=${SHORT_BOARD_NAME}"
|
echo "BOARD_DIR=${BOARD_DIR} SHORT_BOARD_NAME=${SHORT_BOARD_NAME}"
|
||||||
|
|
||||||
which realpath >/dev/null 2>&1 || (which grealpath >/dev/null 2>&1 && alias realpath='grealpath')
|
shopt -s expand_aliases
|
||||||
|
if which grealpath >/dev/null 2>&1; then alias realpath='grealpath'; fi
|
||||||
FDIR=$(realpath $(dirname "$0"))
|
FDIR=$(realpath $(dirname "$0"))
|
||||||
BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR")
|
BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue