Merge pull request smartdevicelink#13 from SmartDeviceLinkMirror/fix/…

…copy_sdl_libraries

Minor fixes

atf_parallels/Readme.md

@@ -40,3 +40,4 @@ The following options are required to run docker container:
 ## Dependencies:
  - screen
  - Docker
+ - rsync

atf_parallels/docker/build.sh

@@ -2,19 +2,33 @@
 
 _ubuntu_ver=$1
 _ubuntu_ver_default=18
+_hosted_ubuntu_ver=$(lsb_release -sr 2>/dev/null)
+
+function warning {
+  echo "--WARNING!"
+  echo "--$1"
+  echo ""
+}
 
 if [ -z $_ubuntu_ver ]; then
   _ubuntu_ver=$_ubuntu_ver_default
-  echo "Ubuntu version was not specified, $_ubuntu_ver_default will be used as default"
+  warning "Ubuntu version was not specified, $_ubuntu_ver will be used as default"
 fi
 
 case $_ubuntu_ver in
   16|18)
     _ubuntu_ver=$_ubuntu_ver.04
+    if [ ! -z $_hosted_ubuntu_ver ]; then
+      if [ ! $_hosted_ubuntu_ver = $_ubuntu_ver ]; then
+        warning "Specified Ubuntu version '$_ubuntu_ver' does not match the hosted Ubuntu version '$_hosted_ubuntu_ver'"
+      fi
+    else
+      warning "Failed to detect hosted Ubuntu version"
+    fi
+
     echo "Ubuntu version: "$_ubuntu_ver;;
   *)
-    echo "Specified Ubuntu version is unexpected";
-    echo "Allowed versions: 16 or 18";
+    warning "Specified Ubuntu version '$_ubuntu_ver' is unexpected. Allowed versions: 16 or 18";
     exit 1;;
 esac
 

tools/runners/parallels.sh

@@ -71,6 +71,7 @@ function prepare_sdl {
     cp -r $_path_sdl $_sdl_prepared
 
     if [ ! -z "$_path_3rd_party" ]; then
+        LD_LIBRARY_PATH=$_path_3rd_party/lib:$_path_3rd_party/x86_64/lib:$LD_LIBRARY_PATH \
         ldd $_sdl_prepared/bin/smartDeviceLinkCore \
         | grep "$_path_3rd_party/lib\|$_path_3rd_party/x86_64/lib" \
         | awk '{print $3}' \
@@ -232,6 +233,7 @@ function show_progress {
 function clean_up {
     rm -r $_tmp_dir
     rm $_queue
+    rm $_queue_reference
 }
 
 #############################################################