Przeglądaj źródła

Corrected scripts for workflow.

Use /bin/bash rather than relying on execution permissions.
Christophe Favergeon 3 lat temu
rodzic
commit
3b3d65c3a4
3 zmienionych plików z 5 dodań i 5 usunięć
  1. 2 2
      Doxygen/gen_doc.sh
  2. 1 1
      Scripts/git/gen_changelog.sh
  3. 2 2
      Scripts/git/gen_pack.sh

+ 2 - 2
Doxygen/gen_doc.sh

@@ -28,7 +28,7 @@ else
 fi
 fi
 
 
 if [ -z $VERSION ]; then
 if [ -z $VERSION ]; then
-  VERSION_FULL=$(${DESCRIBE} "v")
+  VERSION_FULL=$(/bin/bash ${DESCRIBE} "v")
   VERSION=${VERSION_FULL%+*}
   VERSION=${VERSION_FULL%+*}
 fi
 fi
 
 
@@ -41,7 +41,7 @@ sed -e "s/{projectNumber}/${VERSION}/" "${DIRNAME}/dsp.dxy.in" \
   > "${DIRNAME}/dsp.dxy"
   > "${DIRNAME}/dsp.dxy"
 
 
 echo "${CHANGELOG} -f html > history.txt"
 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"
 echo "${DOXYGEN} dsp.dxy"
 "${DOXYGEN}" dsp.dxy
 "${DOXYGEN}" dsp.dxy

+ 1 - 1
Scripts/git/gen_changelog.sh

@@ -141,7 +141,7 @@ if [ -n "$1" ]; then
   PREFIX=$1
   PREFIX=$1
 fi
 fi
 TAGS=$(git for-each-ref --format "%(objecttype) %(refname)" --sort="-v:refname" "refs/tags/${PREFIX}*" 2>/dev/null | cut -d\  -f2)
 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
 print_${FORMAT}_head
 
 

+ 2 - 2
Scripts/git/gen_pack.sh

@@ -20,7 +20,7 @@ set -o pipefail
 DIRNAME=$(dirname $(readlink -f $0))
 DIRNAME=$(dirname $(readlink -f $0))
 CHANGELOG=$(readlink -f ${DIRNAME}/gen_changelog.sh)
 CHANGELOG=$(readlink -f ${DIRNAME}/gen_changelog.sh)
 DESCRIBE=$(readlink -f ${DIRNAME}/git_describe.sh)
 DESCRIBE=$(readlink -f ${DIRNAME}/git_describe.sh)
-VERSION=$(${DESCRIBE} v)
+VERSION=$(/bin/bash ${DESCRIBE} v)
 
 
 function usage {
 function usage {
   echo "$(basename $0) [-h|--help] [<pdsc>]"
   echo "$(basename $0) [-h|--help] [<pdsc>]"
@@ -184,7 +184,7 @@ last=$(grep -n "</releases>" ${PACK_VENDOR}.${PACK_NAME}.pdsc | cut -d: -f1)
 let first-=1
 let first-=1
 let last+=1
 let last+=1
 head -n ${first} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" > "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc"
 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" | \
 tail -n +${last} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" | \
   sed -e "s/Cversion=\"[^\"]*\"/Cversion=\"${VERSION}\"/" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc"
   sed -e "s/Cversion=\"[^\"]*\"/Cversion=\"${VERSION}\"/" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc"