Skip to content
Snippets Groups Projects
Commit 9d87dedf authored by Gabi Seitz's avatar Gabi Seitz
Browse files

Merge branch 'feature/extractModulePart_improveErrorHandling' into 'master'

[moduleutil] Print and throw error if something went wrong while checking the module version

See merge request !613
parents eea2f27d d9a76e1f
No related branches found
No related tags found
1 merge request!613[moduleutil] Print and throw error if something went wrong while checking the module version
...@@ -389,7 +389,12 @@ for MOD in $DEPENDING_MODULE_NAMES ...@@ -389,7 +389,12 @@ for MOD in $DEPENDING_MODULE_NAMES
do do
if [ $MOD != $MODULE_NAME ]; then if [ $MOD != $MODULE_NAME ]; then
MODULE_DIR=${MOD%*/} MODULE_DIR=${MOD%*/}
getVersionGit $MODULE_DIR $(pwd)/$MODULE_NAME/install$MODULE_NAME.sh >>$MODULE_NAME/$README_FILE getVersionGit $MODULE_DIR $(pwd)/$MODULE_NAME/install$MODULE_NAME.sh | tee -a $MODULE_NAME/$README_FILE
grep "Error:" $MODULE_NAME/$README_FILE > /dev/null
EXIT_CODE=$?
if [[ $EXIT_CODE == 0 ]]; then
exit
fi
fi fi
done done
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# (c) 2016 Christoph Grüninger # (c) 2016 Christoph Grüninger
# #
if [ "${args[1]}" = "-h" ]; then if [ "$1" = "-h" ]; then
echo "USAGE: ./getDumuxDuneVersions.sh" echo "USAGE: ./getDumuxDuneVersions.sh"
echo; exit echo; exit
fi fi
...@@ -83,9 +83,9 @@ function getVersionGit ...@@ -83,9 +83,9 @@ function getVersionGit
cd .. cd ..
} }
# run script from comand line # run script from command line
# suppressed for use of external script when variable set accordingly # suppressed for use of external script when variable set accordingly
if [ "$CALL_FROM_EXTERNAL_SCRIPT" == "no" ]; then if [ "$CALL_FROM_EXTERNAL_SCRIPT" != "yes" ]; then
echo "# DUNE/DUMUX VERSIONS" > $OUTFILE echo "# DUNE/DUMUX VERSIONS" > $OUTFILE
echo "Creating file containing the version numbers:" echo "Creating file containing the version numbers:"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment