2.0.3 release

CHANGELOG

@@ -5,6 +5,14 @@ Changelog started with version 1.2.0
 
 ## [Unreleased]
 
+## [2.0.3] - 2019-11-26
+### Fixed
+- [BASH] Improve compatibility with macOS
+- [GUI] Load XML parser plugins after saving of settings file
+
+### Changed
+- [BASH] Download attempts are made now with curl and wget
+
 ## [2.0.2] - 2019-11-21
 ### Fixed
 - [CMD] Ignore called command during version detection of Bash-based modules

README

@@ -33,7 +33,7 @@ The workflow designer can be started using
 ./workflowDesigner.sh (or java -jar jars/WatchdogDesigner.jar)
 
 The workflow designer depends on the Javafx SDK. The bash script will try 
-to identify the install location of the javafx SDK automatically.
+to identify the installation location of the javafx SDK automatically.
 
 ################################ JAR FILES #################################
 watchdog.jar			command-line tool that executes Watchdog workflows

core_lib/functions.sh

@@ -729,6 +729,7 @@ function downloadFile() {
 		RET_CURL=$?
 		BIN_WGET=$({ which "wget"; } 2>&1)
 		RET_WGET=$?
+		RET=1
 
 		# check if curl or wget is there
 		if [ $RET_CURL -ne 0 ] && [ $RET_WGET -ne 0 ]; then
@@ -740,12 +741,11 @@ function downloadFile() {
 		if [ $RET_CURL -eq 0 ]; then
 			curl "${URL}" --output "${DEST}" --location > /dev/null 2>&1
 			RET=$?
-		else
-			# use wget
-			if [ $RET_WGET -eq 0 ]; then
-				wget -qO- -O "${DEST}" "${URL}" > /dev/null 2>&1
-				RET=$?
-			fi
+		fi
+		# use wget
+		if [ $RET -ne 0 ] && [ $RET_WGET -eq 0 ]; then
+			wget -qO- -O "${DEST}" "${URL}" > /dev/null 2>&1
+			RET=$?
 		fi
 
 		# test if exit code is ok

documentation/Watchdog-manual.html

@@ -100,7 +100,7 @@
 
 <a name="requirements" class="subtopic">2.1 Requirements</a>
 
-Watchdog is platform independent as it is written in Java and requires JRE (Java Runtime Environment) 11 or higher. The GUI of the workflow designer and the <pre class="name">moduleMaker</pre> depends on the JavaFX SDK that is not part of new JRE builds. Both launcher bash scripts (<pre class="name">workflowDesigner.sh</pre> and <pre class="name">moduleMaker.sh</pre>) will try to identify the install location of the JavaFX SDK automatically. If that fails or the installation location of the JavaFX SDK is known the <pre class="name">JFX_SDK_LIB_PATH_ENV</pre> environment variable can be used to set the path manually using <pre class="name">export JFX_SDK_LIB_PATH_ENV=/path/to/javafx/sdk/</pre>.
+Watchdog is platform independent as it is written in Java and requires JRE (Java Runtime Environment) 11 or higher. The GUI of the workflow designer and the <pre class="name">moduleMaker</pre> depends on the JavaFX SDK that is not part of new JRE builds. Both launcher bash scripts (<pre class="name">workflowDesigner.sh</pre> and <pre class="name">moduleMaker.sh</pre>) will try to identify the installation location of the JavaFX SDK automatically. If that fails or the installation location of the JavaFX SDK is known the <pre class="name">JFX_SDK_LIB_PATH_ENV</pre> environment variable can be used to set the path manually using <pre class="name">export JFX_SDK_LIB_PATH_ENV=/path/to/javafx/sdk/</pre>.
 
 <br /><br />
 Most Watchdog modules require a Unix based system and were tested on SUSE Linux. They might not run without any changes on other Unix systems or Windows but users can define custom modules that are compatible with their installed software and operating system. Each of the modules might require additional software to be installed. These requirements can be checked for the modules that are delivered with Watchdog with the help of <pre class="name">helper_scripts/dependencyTest.sh</pre> as described below.