common-functions: handle existing openssl directory

Seems upstream edk2 helpfully added an openssl directory to
CryptoPkg/Library/OpensslLib, causing my logic of
  mv openssl-<version> openssl
after extracting downloaded tarball to do the completely
wrong thing. Fix that.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/common-functions b/common-functions
index ae4c49a..f504297 100644
--- a/common-functions
+++ b/common-functions
@@ -171,7 +171,11 @@ function clone_process_openssl
         rm -rf openssl
     fi
     tar xzf "$OPENSSL_TAR"
-    mv "$OPENSSL_VER" openssl
+    if [ ! -d openssl ]; then
+        mkdir openssl
+    fi
+    mv "$OPENSSL_VER"/* openssl
+    rm -r "$OPENSSL_VER"/
     # perl process_files.pl # not needed and not currently working
     return $?
 }