From 3b3d65c3a417cb44d7b2cecdffc7b5ccbae009b4 Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Tue, 28 Jun 2022 13:19:31 +0200 Subject: [PATCH] Corrected scripts for workflow. Use /bin/bash rather than relying on execution permissions. --- Doxygen/gen_doc.sh | 4 ++-- Scripts/git/gen_changelog.sh | 2 +- Scripts/git/gen_pack.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doxygen/gen_doc.sh b/Doxygen/gen_doc.sh index 6d90451b..e4cbc7ec 100644 --- a/Doxygen/gen_doc.sh +++ b/Doxygen/gen_doc.sh @@ -28,7 +28,7 @@ else fi if [ -z $VERSION ]; then - VERSION_FULL=$(${DESCRIBE} "v") + VERSION_FULL=$(/bin/bash ${DESCRIBE} "v") VERSION=${VERSION_FULL%+*} fi @@ -41,7 +41,7 @@ sed -e "s/{projectNumber}/${VERSION}/" "${DIRNAME}/dsp.dxy.in" \ > "${DIRNAME}/dsp.dxy" echo "${CHANGELOG} -f html > history.txt" -"${CHANGELOG}" -f html 1> history.txt 2>/dev/null +/bin/bash "${CHANGELOG}" -f html 1> history.txt 2>/dev/null echo "${DOXYGEN} dsp.dxy" "${DOXYGEN}" dsp.dxy diff --git a/Scripts/git/gen_changelog.sh b/Scripts/git/gen_changelog.sh index fcd39e05..c03b024d 100644 --- a/Scripts/git/gen_changelog.sh +++ b/Scripts/git/gen_changelog.sh @@ -141,7 +141,7 @@ if [ -n "$1" ]; then PREFIX=$1 fi TAGS=$(git for-each-ref --format "%(objecttype) %(refname)" --sort="-v:refname" "refs/tags/${PREFIX}*" 2>/dev/null | cut -d\ -f2) -LATEST=$(${DESCRIBE} "${PREFIX}") +LATEST=$(/bin/bash ${DESCRIBE} "${PREFIX}") print_${FORMAT}_head diff --git a/Scripts/git/gen_pack.sh b/Scripts/git/gen_pack.sh index d7a606ed..4979ff39 100644 --- a/Scripts/git/gen_pack.sh +++ b/Scripts/git/gen_pack.sh @@ -20,7 +20,7 @@ set -o pipefail DIRNAME=$(dirname $(readlink -f $0)) CHANGELOG=$(readlink -f ${DIRNAME}/gen_changelog.sh) DESCRIBE=$(readlink -f ${DIRNAME}/git_describe.sh) -VERSION=$(${DESCRIBE} v) +VERSION=$(/bin/bash ${DESCRIBE} v) function usage { echo "$(basename $0) [-h|--help] []" @@ -184,7 +184,7 @@ last=$(grep -n "" ${PACK_VENDOR}.${PACK_NAME}.pdsc | cut -d: -f1) let first-=1 let last+=1 head -n ${first} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" > "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" -"${CHANGELOG}" -p -f pdsc 2>/dev/null | sed "s/^/ /" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" +/bin/bash "${CHANGELOG}" -p -f pdsc 2>/dev/null | sed "s/^/ /" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" tail -n +${last} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" | \ sed -e "s/Cversion=\"[^\"]*\"/Cversion=\"${VERSION}\"/" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc"