Enforced the freetype switches checks

Author: judovana

sbin/prepareWorkspace.sh

@@ -70,8 +70,8 @@ isFreeTypeInSources() {
     echo "No jdk sources exists to to determine $libfreetypeid presence"
     exit 1
   fi
-  find "$location" | grep  -q "$libfreetypeid"
-  local found=$?
+  local found=0
+  find "$location" | grep  -q "$libfreetypeid" || found=$?
   if [ $found -eq 0 ] ; then
     echo "$libfreetypeid found in $location"
     checkBundledFreetypeJdkConfig
@@ -138,7 +138,7 @@ unpackFromArchive() {
 
 copyFromDirOrUnpackFromArchive() {
   echo "Cleaning the copy of OpenJDK source repository from $(pwd)/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]} and replacing with a fresh copy in 10 seconds..."
-  verboseSleep	 10
+  verboseSleep	 1
   rm -rf "./${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}"
   mkdir  "./${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}"
   # Note that we are not persisting the build directory
@@ -866,6 +866,8 @@ downloadBootJdkIfNeeded () {
 
 # Download all of the dependencies for OpenJDK (Alsa, FreeType, boot-jdk etc.)
 downloadingRequiredDependencies() {
+  local freeTypeInSources=0
+  isFreeTypeInSources || freeTypeInSources="$?"
   if [[ "${BUILD_CONFIG[CLEAN_LIBS]}" == "true" ]]; then
     rm -rf "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype" || true
     rm -rf "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedalsa" || true
@@ -892,7 +894,7 @@ downloadingRequiredDependencies() {
   fi
 
   if [[ "${BUILD_CONFIG[FREETYPE]}" == "true" ]]; then
-    if ! isFreeTypeInSources ; then
+    if [ "0${freeTypeInSources}" -ne 0 ]  ; then
       if [ -z "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" ]; then
         echo "Checking and download FreeType Font dependency"
         checkingAndDownloadingFreeType