diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index f1b9ec9ae1..33d7979850 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -142,7 +142,8 @@ runs: echo "RUN_SIMULATOR=${{toJSON(inputs.run_simulator)}}" >> $GITHUB_ENV echo "REF=${{github.ref_name}}" >> $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 "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}}" diff --git a/firmware/bin/gen_image_board.sh b/firmware/bin/gen_image_board.sh index 39f4c23c21..39561e4d23 100644 --- a/firmware/bin/gen_image_board.sh +++ b/firmware/bin/gen_image_board.sh @@ -4,7 +4,8 @@ BOARD_DIR=${1:-$BOARD_DIR} SHORT_BOARD_NAME=${2:-$SHORT_BOARD_NAME} 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")/..) BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR") diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index d58d209564..9c80c6b205 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -31,7 +31,8 @@ fi 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")) BOARD_DIR=$(realpath --relative-to "$FDIR" "$BOARD_DIR")