Fixed style issues and potential bugs.

8 files changed, 156 insertions, 157 deletions

diff --git a/libraries/vendors/compile-altera.sh b/libraries/vendors/compile-altera.sh
index 00e0fbd5d..73aaeb164 100755
--- a/libraries/vendors/compile-altera.sh
+++ b/libraries/vendors/compile-altera.sh
@@ -218,14 +218,14 @@ fi
 # Search Altera Quartus in default installation locations
 DefaultDirectories=("/opt/Altera" "/opt/altera" "/c/Altera")
 if [ ! -z $QUARTUS_ROOTDIR ]; then
-	EnvSourceDir=$QUARTUS_ROOTDIR/${Altera_Quartus_Settings[SourceDirectory]}
+	EnvSourceDir="$QUARTUS_ROOTDIR/${Altera_Quartus_Settings[SourceDirectory]}"
 else
 	for DefaultDir in "${DefaultDirectories[@]}"; do
 		for Major in 16 15 14 13; do
 			for Minor in 1 0; do
 				Dir=$DefaultDir/${Major}.${Minor}/quartus
 				if [ -d $Dir ]; then
-					EnvSourceDir=$Dir/${Altera_Quartus_Settings[SourceDirectory]}
+					EnvSourceDir="$Dir/${Altera_Quartus_Settings[SourceDirectory]}"
 					break 3
 				fi
 			done
@@ -297,7 +297,7 @@ Files=(
 	220model.vhd
 )
 CreateLibraryStruct $StructName "lpm" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="SGATE"
 Files=(
@@ -305,7 +305,7 @@ Files=(
 	sgate.vhd
 )
 CreateLibraryStruct $StructName "sgate" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="ALTERA"
 Files=(
@@ -317,7 +317,7 @@ Files=(
 	alt_dspbuilder_package.vhd
 )
 CreateLibraryStruct $StructName "altera" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="ALTERA_MF"
 Files=(
@@ -325,7 +325,7 @@ Files=(
 	altera_mf.vhd
 )
 CreateLibraryStruct $StructName "altera_mf" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 
 StructName="ALTERA_LNSIM"
@@ -333,7 +333,7 @@ Files=(
 	altera_lnsim_components.vhd
 )
 CreateLibraryStruct $StructName "altera_lnsim" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 
 # Altera device libraries
@@ -346,11 +346,11 @@ Files=(
 	max_atoms.vhd
 	max_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "max" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Max II library
@@ -359,11 +359,11 @@ Files=(
 	maxii_atoms.vhd
 	maxii_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max II'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "maxii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Max V library
@@ -372,11 +372,11 @@ Files=(
 	maxv_atoms.vhd
 	maxv_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "maxv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria II library
@@ -391,11 +391,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaii_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriaii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria II (PCIe) library
@@ -405,11 +405,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaii_pcie_hip_components.vhd
 		arriaii_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "arriaii_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+		test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -424,11 +424,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaiigz_hssi_components.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II GZ'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriaiigz" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # ArriaV library
@@ -443,11 +443,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriav_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriav" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria V GZ library
@@ -462,11 +462,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriavgz_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V GZ'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriavgz" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria V GZ (PCIe) library
@@ -476,11 +476,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriavgz_pcie_hip_components.vhd
 		arriavgz_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V GZ (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "arriavgz_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+		test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -490,11 +490,11 @@ Files=(
 	cyclone_atoms.vhd
 	cyclone_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cyclone" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone II library
@@ -503,11 +503,11 @@ Files=(
 	cycloneii_atoms.vhd
 	cycloneii_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone II'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone III library
@@ -516,11 +516,11 @@ Files=(
 	cycloneiii_atoms.vhd
 	cycloneiii_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone III'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneiii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone IV library
@@ -535,11 +535,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cycloneiv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneiv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone IV (PCIe) library
@@ -549,11 +549,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cycloneiv_pcie_hip_components.vhd
 		cycloneiv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "cycloneiv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+		test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -563,11 +563,11 @@ Files=(
 	cycloneive_atoms.vhd
 	cycloneive_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV E'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneive" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone V library
@@ -582,11 +582,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cyclonev_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cyclonev" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix IV library
@@ -601,11 +601,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixiv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix IV'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "stratixiv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix IV (PCIe) library
@@ -615,11 +615,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixiv_pcie_hip_components.vhd
 		stratixiv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix IV (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "stratixiv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+		test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -635,11 +635,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "stratixv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix V (PCIe) library
@@ -649,11 +649,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixv_pcie_hip_components.vhd
 		stratixv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix V (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "stratixv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+		test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -663,11 +663,11 @@ Files=(
 	fiftyfivenm_atoms.vhd
 	fiftyfivenm_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device '55 nm'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "fiftyfivenm" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_NM -eq 1 && Libraries+=($StructName)
+	test $COMPILE_NM -eq 1 && Libraries+=("$StructName")
 fi
 
 # 20 nm library
@@ -684,11 +684,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		twentynm_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device '20 nm'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "twentynm" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_NM -eq 1 && Libraries+=($StructName)
+	test $COMPILE_NM -eq 1 && Libraries+=("$StructName")
 fi
 
 # if [[ $DEBUG -eq 1 ]]; then
@@ -698,7 +698,7 @@ fi
 # fi
 
 # Compile libraries
-if [[ "$Libraries" != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-intel.sh b/libraries/vendors/compile-intel.sh
index b1810e166..79686f8b5 100755
--- a/libraries/vendors/compile-intel.sh
+++ b/libraries/vendors/compile-intel.sh
@@ -218,14 +218,14 @@ fi
 # Search Intel Quartus in default installation locations
 DefaultDirectories=("/opt/IntelFPGA" "/opt/intelfpga" "/opt/Intel" "/opt/intel" "/opt/Altera" "/opt/altera" "/c/intelFPGA")
 if [ ! -z $QUARTUS_ROOTDIR ]; then
-	EnvSourceDir=$QUARTUS_ROOTDIR/${Intel_Quartus_Settings[SourceDirectory]}
+	EnvSourceDir="$QUARTUS_ROOTDIR/${Intel_Quartus_Settings[SourceDirectory]}"
 else
 	for DefaultDir in "${DefaultDirectories[@]}"; do
 		for Major in 21 20 19 18 17 16; do
 			for Minor in 4 3 2 1 0; do
 				Dir=$DefaultDir/${Major}.${Minor}/quartus
 				if [ -d $Dir ]; then
-					EnvSourceDir=$Dir/${Intel_Quartus_Settings[SourceDirectory]}
+					EnvSourceDir="$Dir/${Intel_Quartus_Settings[SourceDirectory]}"
 					break 3
 				fi
 			done
@@ -296,7 +296,7 @@ Files=(
 	220model.vhd
 )
 CreateLibraryStruct $StructName "lpm" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="SGATE"
 Files=(
@@ -304,7 +304,7 @@ Files=(
 	sgate.vhd
 )
 CreateLibraryStruct $StructName "sgate" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="ALTERA"
 Files=(
@@ -316,7 +316,7 @@ Files=(
 	alt_dspbuilder_package.vhd
 )
 CreateLibraryStruct $StructName "altera" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 StructName="ALTERA_MF"
 Files=(
@@ -324,7 +324,7 @@ Files=(
 	altera_mf.vhd
 )
 CreateLibraryStruct $StructName "altera_mf" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 
 StructName="ALTERA_LNSIM"
@@ -332,7 +332,7 @@ Files=(
 	altera_lnsim_components.vhd
 )
 CreateLibraryStruct $StructName "altera_lnsim" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_ALTERA -eq 1 && Libraries+=($StructName)
+test $COMPILE_ALTERA -eq 1 && Libraries+=("$StructName")
 
 # Intel device libraries
 # ==============================================================================
@@ -344,11 +344,11 @@ Files=(
 	max_atoms.vhd
 	max_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "max" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Max II library
@@ -357,11 +357,11 @@ Files=(
 	maxii_atoms.vhd
 	maxii_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max II'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "maxii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Max V library
@@ -370,11 +370,11 @@ Files=(
 	maxv_atoms.vhd
 	maxv_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Max V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "maxv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_MAX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_MAX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria II library
@@ -389,11 +389,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaii_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriaii" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria II (PCIe) library
@@ -403,11 +403,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaii_pcie_hip_components.vhd
 		arriaii_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "arriaii_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+		test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -422,11 +422,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriaiigz_hssi_components.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria II GZ'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriaiigz" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # ArriaV library
@@ -441,11 +441,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriav_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriav" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria V GZ library
@@ -460,11 +460,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriavgz_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V GZ'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "arriavgz" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+	test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 fi
 
 # Arria V GZ (PCIe) library
@@ -474,11 +474,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		arriavgz_pcie_hip_components.vhd
 		arriavgz_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Arria V GZ (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "arriavgz_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_ARRIA -eq 1 && Libraries+=($StructName)
+		test $COMPILE_ARRIA -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -494,11 +494,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cycloneiv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneiv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone IV (PCIe) library
@@ -508,11 +508,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cycloneiv_pcie_hip_components.vhd
 		cycloneiv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "cycloneiv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+		test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -522,11 +522,11 @@ Files=(
 	cycloneive_atoms.vhd
 	cycloneive_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone IV E'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cycloneive" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Cyclone V library
@@ -541,11 +541,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		cyclonev_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Cyclone V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "cyclonev" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_CYCLONE -eq 1 && Libraries+=($StructName)
+	test $COMPILE_CYCLONE -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix IV library
@@ -560,11 +560,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixiv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix IV'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "stratixiv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix IV (PCIe) library
@@ -574,11 +574,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixiv_pcie_hip_components.vhd
 		stratixiv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix IV (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "stratixiv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+		test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -594,11 +594,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixv_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix V'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "stratixv" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+	test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 fi
 
 # Stratix V (PCIe) library
@@ -608,11 +608,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		stratixv_pcie_hip_components.vhd
 		stratixv_pcie_hip_atoms.vhd
 	)
-	if [[ -f "$SourceDirectory/$Files" ]]; then
+	if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 		test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'Stratix V (PCIe)'.${ANSI_NOCOLOR}"
 		CreateLibraryStruct $StructName "stratixv_pcie_hip" "." $VHDLVersion "${Files[@]}"
 
-		test $COMPILE_STRATIX -eq 1 && Libraries+=($StructName)
+		test $COMPILE_STRATIX -eq 1 && Libraries+=("$StructName")
 	fi
 fi
 
@@ -622,11 +622,11 @@ Files=(
 	fiftyfivenm_atoms.vhd
 	fiftyfivenm_components.vhd
 )
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device '55 nm'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "fiftyfivenm" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_NM -eq 1 && Libraries+=($StructName)
+	test $COMPILE_NM -eq 1 && Libraries+=("$StructName")
 fi
 
 # 20 nm library
@@ -643,11 +643,11 @@ if [[ $SKIP_LARGE_FILES -eq 0 ]]; then
 		twentynm_hssi_atoms.vhd
 	)
 fi
-if [[ -f "$SourceDirectory/$Files" ]]; then
+if [[ -f "$SourceDirectory/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device '20 nm'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "twentynm" "." $VHDLVersion "${Files[@]}"
 
-	test $COMPILE_NM -eq 1 && Libraries+=($StructName)
+	test $COMPILE_NM -eq 1 && Libraries+=("$StructName")
 fi
 
 # if [[ $DEBUG -eq 1 ]]; then
@@ -656,7 +656,7 @@ fi
 	# done
 # fi
 
-if [[ $Libraries != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-lattice.sh b/libraries/vendors/compile-lattice.sh
index ac5a04b1e..a7cdfd7c3 100755
--- a/libraries/vendors/compile-lattice.sh
+++ b/libraries/vendors/compile-lattice.sh
@@ -113,7 +113,7 @@ while [[ $# -gt 0 ]]; do
 			if [[ "${1:0:2}" == "--" ]]; then
 				key=${1:2}; key=${key,,}
 				for Device in $DeviceList; do
-					if [[ $key == ${Device,,} ]]; then
+					if [[ $key == "${Device,,}" ]]; then
 						declare "DEV_${Device}_Enable"=1
 						COMMAND=3
 						FOUND=1
@@ -199,14 +199,14 @@ fi
 # Search Lattice Diamond in default installation locations
 DefaultDirectories=("/usr/local/diamond" "/opt/Diamond" "/opt/diamond" "/c/Lattice/Diamond")
 if [ ! -z $LSC_DIAMOND ]; then
-	EnvSourceDir=$FOUNDRY/../${Lattice_Diamond_Settings[SourceDirectory]}
+	EnvSourceDir="$FOUNDRY/../${Lattice_Diamond_Settings[SourceDirectory]}"
 else
 	for DefaultDir in "${DefaultDirectories[@]}"; do
 		for Major in 3; do
 			for Minor in 12 11 10 9 8 7 6 5; do
 				Dir=$DefaultDir/${Major}.${Minor}_x64
 				if [ -d $Dir ]; then
-					EnvSourceDir=$Dir/${Lattice_Diamond_Settings[SourceDirectory]}
+					EnvSourceDir="$Dir/${Lattice_Diamond_Settings[SourceDirectory]}"
 					break 3
 				fi
 			done
@@ -287,15 +287,14 @@ Files=(
 	ORCA_IO.vhd
 	ORCA_MEM.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'EC'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "ec" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
-else
-	echo "not found: $SourceDirectory/$Files"
-
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
+#else
+#	echo "not found: $SourceDirectory/${Files[0]}"
 fi
 
 # ECP devices
@@ -311,12 +310,12 @@ Files=(
 	ORCA_IO.vhd
 	ORCA_MEM.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'ECP'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "ecp" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 
@@ -335,12 +334,12 @@ Files=(
 	ECP2_MULT.vhd
 	ECP2_SL.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'ECP2'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "ecp2" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # ECP3 devices
@@ -358,12 +357,12 @@ Files=(
 	ECP3_MULT.vhd
 	ECP3_SL.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'ECP3'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "ecp3" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # ECP5U devices
@@ -380,12 +379,12 @@ Files=(
 	ECP5U_SL.vhd
 	gsr_pur_assign.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'ECP5U'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "ecp5u" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # LPTM devices
@@ -401,12 +400,12 @@ Files=(
 	MACHXO_MEM.vhd
 	MACHXO_MISC.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'LPTM'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "lptm" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # LPTM2 devices
@@ -423,12 +422,12 @@ Files=(
 	MACHXO2_MEM.vhd
 	MACHXO2_MISC.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'LPTM2'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "lptm2" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # MachXO devices
@@ -444,12 +443,12 @@ Files=(
 	MACHXO_MEM.vhd
 	MACHXO_MISC.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'MachXO'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "machxo" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # MachXO2 devices
@@ -466,12 +465,12 @@ Files=(
 	MACHXO2_MEM.vhd
 	MACHXO2_MISC.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'MachXO2'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "machxo2" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # MachXO3L devices
@@ -488,12 +487,12 @@ Files=(
 	MACHXO3L_MEM.vhd
 	MACHXO3L_MISC.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'MachXO3L'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "machxo3l" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # SC devices
@@ -509,12 +508,12 @@ Files=(
 	ORCA_MIS.vhd
 	ORCA_SL.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'SC'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "sc" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # SCM devices
@@ -530,12 +529,12 @@ Files=(
 	ORCA_MIS.vhd
 	ORCA_SL.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'SCM'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "scm" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # XP devices
@@ -551,12 +550,12 @@ Files=(
 	ORCA_IO.vhd
 	ORCA_MEM.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'XP'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "xp" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # XP2 devices
@@ -574,12 +573,12 @@ Files=(
 	XP2_MULT.vhd
 	XP2_SL.vhd
 )
-if [[ -f "$SourceDirectory/$SourceDir/$Files" ]]; then
+if [[ -f "$SourceDirectory/$SourceDir/${Files[0]}" ]]; then
 	test $DEBUG -eq 1 && echo -e "    ${ANSI_DARK_GRAY}Found device 'XP2'.${ANSI_NOCOLOR}"
 	CreateLibraryStruct $StructName "xp2" $SourceDir $VHDLVersion "${Files[@]}"
 
 	VarName="DEV_${StructName}_Enable"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 fi
 
 # if [[ $DEBUG -eq 1 ]]; then
@@ -589,7 +588,7 @@ fi
 # fi
 
 # Compile libraries
-if [[ "$Libraries" != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-osvvm.sh b/libraries/vendors/compile-osvvm.sh
index adac92ae5..dbdf7c70b 100755
--- a/libraries/vendors/compile-osvvm.sh
+++ b/libraries/vendors/compile-osvvm.sh
@@ -244,7 +244,7 @@ Files=(
 	OsvvmContext.vhd
 )
 CreateLibraryStruct $StructName "osvvm" "." $VHDLVersion "${Files[@]}"
-test $COMPILE_OSVVM -eq 1 && Libraries+=($StructName)
+test $COMPILE_OSVVM -eq 1 && Libraries+=("$StructName")
 
 # for VIPName in ${VIPNames[*]}; do
 	# VarName="COMPILE_OSVVM_${VIPName}"
@@ -254,7 +254,7 @@ test $COMPILE_OSVVM -eq 1 && Libraries+=($StructName)
 # done
 
 # Compile libraries
-if [[ "$Libraries" != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-uvvm.sh b/libraries/vendors/compile-uvvm.sh
index 8a4a64116..17d2e7853 100755
--- a/libraries/vendors/compile-uvvm.sh
+++ b/libraries/vendors/compile-uvvm.sh
@@ -388,7 +388,7 @@ done < <(cat "$SourceDirectory/$LibraryPath/script/compile_order.txt")
 
 CreateLibraryStruct $StructName $LibraryName $LibraryPath $VHDLVersion "${Files[@]}"
 
-test $COMPILE_UVVM_UTILITIES -eq 1 && Libraries+=($StructName)
+test $COMPILE_UVVM_UTILITIES -eq 1 && Libraries+=("$StructName")
 
 
 # Reading uvvm_vvc_framework library files
@@ -408,7 +408,7 @@ done < <(cat "$SourceDirectory/$LibraryPath/script/compile_order.txt")
 
 CreateLibraryStruct $StructName $LibraryName $LibraryPath $VHDLVersion "${Files[@]}"
 
-test $COMPILE_UVVM_VVC_FRAMEWORK -eq 1 && Libraries+=($StructName)
+test $COMPILE_UVVM_VVC_FRAMEWORK -eq 1 && Libraries+=("$StructName")
 
 
 # Verification IPs
@@ -442,7 +442,7 @@ while IFS= read -r VIPDirectory; do
 	CreateLibraryStruct $StructName $LibraryName $LibraryPath $VHDLVersion "${Files[@]}"
 
 	VarName="COMPILE_UVVM_${VIPName}"
-	test ${!VarName} -eq 1 && Libraries+=($StructName)
+	test ${!VarName} -eq 1 && Libraries+=("$StructName")
 done < <(find $SourceDirectory/*vip* -type d -prune)
 
 # if [[ $DEBUG -eq 1 ]]; then
@@ -451,7 +451,7 @@ done < <(find $SourceDirectory/*vip* -type d -prune)
 	# done
 # fi
 
-if [[ $Libraries != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-xilinx-ise.sh b/libraries/vendors/compile-xilinx-ise.sh
index f6f628597..5ac581b28 100755
--- a/libraries/vendors/compile-xilinx-ise.sh
+++ b/libraries/vendors/compile-xilinx-ise.sh
@@ -211,14 +211,14 @@ fi
 # Search Xilinx ISE in default installation locations
 DefaultDirectories=("/opt/Xilinx" "/opt/xilinx" "/c/Xilinx")
 if [ ! -z $XILINX ]; then
-	EnvSourceDir=$XILINX/${Xilinx_ISE_Settings[SourceDirectory]}
+	EnvSourceDir="$XILINX/${Xilinx_ISE_Settings[SourceDirectory]}"
 else
 	for DefaultDir in "${DefaultDirectories[@]}"; do
 		for Major in 14 13; do
 			for Minor in 7 6 5 4 3 2 1 0; do
 				Dir=$DefaultDir/${Major}.${Minor}/ISE_DS
 				if [ -d $Dir ]; then
-					EnvSourceDir=$Dir/${Xilinx_ISE_Settings[SourceDirectory]}
+					EnvSourceDir="$Dir/${Xilinx_ISE_Settings[SourceDirectory]}"
 					break 3
 				fi
 			done
@@ -298,7 +298,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/primitive/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library "${Library}s" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNISIM -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNISIM -eq 1 && Libraries+=("$StructName")
 
 # Reading unisim secureip files
 StructName="UNISIM_SECUREIP"
@@ -310,7 +310,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/secureip/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName "secureip" "${Library}s" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNISIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNISIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=("$StructName")
 
 
 # Library unimacro
@@ -325,7 +325,7 @@ Files=(
 Files=( $(cd $SourceDirectory/$Library; LC_COLLATE=C ls *_MACRO.vhd) )
 
 CreateLibraryStruct $StructName $Library $Library $VHDLVersion "${Files[@]}"
-test $COMPILE_UNIMACRO -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNIMACRO -eq 1 && Libraries+=("$StructName")
 
 
 # Library simprim
@@ -343,7 +343,7 @@ Files=(
 # done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/primitive/other/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library "${Library}s" $VHDLVersion "${Files[@]}"
-test $COMPILE_SIMPRIM -eq 1 && Libraries+=($StructName)
+test $COMPILE_SIMPRIM -eq 1 && Libraries+=("$StructName")
 
 
 # Reading simprim secureip files
@@ -356,7 +356,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/secureip/other/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName "secureip" "${Library}s" $VHDLVersion "${Files[@]}"
-test $COMPILE_SIMPRIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=($StructName)
+test $COMPILE_SIMPRIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=("$StructName")
 
 
 # Library xilinxcorelib
@@ -370,7 +370,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/XilinxCoreLib/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library "XilinxCoreLib" $VHDLVersion "${Files[@]}"
-test $COMPILE_CORELIB -eq 1 && Libraries+=($StructName)
+test $COMPILE_CORELIB -eq 1 && Libraries+=("$StructName")
 
 if [[ $DEBUG -eq 1 ]]; then
 	for StructName in ${Libraries[*]}; do
@@ -379,7 +379,7 @@ if [[ $DEBUG -eq 1 ]]; then
 fi
 
 # Compile libraries
-if [[ "$Libraries" != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/compile-xilinx-vivado.sh b/libraries/vendors/compile-xilinx-vivado.sh
index 4e7c6687e..203a5c35f 100755
--- a/libraries/vendors/compile-xilinx-vivado.sh
+++ b/libraries/vendors/compile-xilinx-vivado.sh
@@ -204,14 +204,14 @@ fi
 # Search Xilinx Vivado in default installation locations
 DefaultDirectories=("/opt/Xilinx/Vivado" "/opt/xilinx/Vivado" "/c/Xilinx/Vivado")
 if [ ! -z $XILINX_VIVADO ]; then
-	EnvSourceDir=$XILINX_VIVADO/${Xilinx_Vivado_Settings[SourceDirectory]}
+	EnvSourceDir="$XILINX_VIVADO/${Xilinx_Vivado_Settings[SourceDirectory]}"
 else
 	for DefaultDir in "${DefaultDirectories[@]}"; do
 		for Major in 2021 2020 2019 2018 2017 2016 2015 2014; do
 			for Minor in 4 3 2 1; do
 				Dir=$DefaultDir/${Major}.${Minor}
 				if [ -d $Dir ]; then
-					EnvSourceDir=$Dir/${Xilinx_Vivado_Settings[SourceDirectory]}
+					EnvSourceDir="$Dir/${Xilinx_Vivado_Settings[SourceDirectory]}"
 					break 3
 				fi
 			done
@@ -297,7 +297,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/retarget/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library "${Library}s" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNISIM -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNISIM -eq 1 && Libraries+=("$StructName")
 
 # Reading unisim secureip files
 StructName="UNISIM_SECUREIP"
@@ -306,7 +306,7 @@ test $DEBUG -eq 1   && echo -e "    ${ANSI_DARK_GRAY}Scanning directory '$Source
 Files=( $(cd $SourceDirectory/${Library}s/secureip; LC_COLLATE=C ls *.vhd) )
 
 CreateLibraryStruct $StructName "secureip" "${Library}s/secureip" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNISIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNISIM -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=("$StructName")
 
 
 # Library unimacro
@@ -323,7 +323,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/$Library/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library $Library $VHDLVersion "${Files[@]}"
-test $COMPILE_UNIMACRO -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNIMACRO -eq 1 && Libraries+=("$StructName")
 
 # Library unifast
 # ==============================================================================
@@ -336,7 +336,7 @@ while IFS= read -r File; do
 done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/$Library/primitive/vhdl_analyze_order")
 
 CreateLibraryStruct $StructName $Library "$Library/primitive" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNIFAST -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNIFAST -eq 1 && Libraries+=("$StructName")
 
 # Reading unifast secureip files
 StructName="UNIFAST_SECUREIP"
@@ -345,11 +345,11 @@ test $DEBUG -eq 1   && echo -e "    ${ANSI_DARK_GRAY}Scanning directory '$Source
 Files=( $(cd $SourceDirectory/$Library/secureip; LC_COLLATE=C ls *.vhd) )
 
 CreateLibraryStruct $StructName "secureip" "$Library/secureip" $VHDLVersion "${Files[@]}"
-test $COMPILE_UNIFAST -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=($StructName)
+test $COMPILE_UNIFAST -eq 1 && test $COMPILE_SECUREIP -eq 1 && Libraries+=("$StructName")
 
 
 # Compile libraries
-if [[ "$Libraries" != "" ]]; then
+if [[ ${#Libraries[@]} -ne 0 ]]; then
 	Compile "$SourceDirectory" "${Libraries[*]}"
 
 	echo "--------------------------------------------------------------------------------"
diff --git a/libraries/vendors/shared.sh b/libraries/vendors/shared.sh
index 1b03572b3..a00540677 100755
--- a/libraries/vendors/shared.sh
+++ b/libraries/vendors/shared.sh
@@ -104,7 +104,7 @@ SetupDirectories() {
 	test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 	SourceDirectory=$($READLINK -f $SourceDirectory)
 	if [[ ! "$DestinationDirectory" = /* ]]; then
-		DestinationDirectory=$WorkingDir/$DestinationDirectory
+		DestinationDirectory="$WorkingDir/$DestinationDirectory"
 	fi
 }