You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/19 10:33:03 UTC
[isis] branch master updated: ISIS-2062: dos2unix fixes for
build-site.sh
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5be27db ISIS-2062: dos2unix fixes for build-site.sh
5be27db is described below
commit 5be27db51639165f2439f3d41b420287483e4dff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 19 10:32:33 2019 +0000
ISIS-2062: dos2unix fixes for build-site.sh
---
scripts/ci/_adoc-gen-config.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/ci/_adoc-gen-config.sh b/scripts/ci/_adoc-gen-config.sh
index 14e1a6f..e1de52f 100644
--- a/scripts/ci/_adoc-gen-config.sh
+++ b/scripts/ci/_adoc-gen-config.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-set -e
SCRIPT_DIR=$( dirname "$0" )
if [ -z "$PROJECT_ROOT_PATH" ]; then
@@ -24,9 +23,11 @@ fi
## run groovy
##
GROOVY_CMD=$(command -v groovy)
+DOS2UNIX_CMD=$(command -v dos2unix)
echo ""
-echo "\$GROOVY_CMD : ${GROOVY_CMD}"
+echo "\$GROOVY_CMD : ${GROOVY_CMD}"
+echo "\$DOS2UNIX_CMD : ${DOS2UNIX_CMD}"
echo ""
# for now meant to run with nightly builds only
@@ -45,10 +46,10 @@ else
-f $PROJECT_ROOT_PATH/core/config/target/classes/META-INF/spring-configuration-metadata.json \
-o $PROJECT_ROOT_PATH/core/config/src/main/doc/modules/config/examples/generated
- if [ ! -z "dos2unix" ]; then
+ if [ ! -z "${DOS2UNIX_CMD}" ]; then
for FILE in $PROJECT_ROOT_PATH/core/config/src/main/doc/modules/config/examples/generated/*
do
- dos2unix $FILE
+ ${DOS2UNIX_CMD} $FILE
done
echo
echo