build-and-install-openssl.sh, install-cmake-binary.sh: Tweak install scripts

* Consistently use "/usr/src" as download and staging area

* install-cmake-binary: Introduce CMAKE_ROOT var

* build-and-install-openssl: Remove redundant -fPIC flag, download openssl sources using "wget"

imagefiles/build-and-install-openssl.sh

@@ -23,7 +23,7 @@ set -ex
 set -o pipefail
 
 WRAPPER=""
-CONFIG_FLAG="-fPIC"
+CONFIG_FLAG=""
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -70,11 +70,13 @@ function build_openssl {
     check_var ${openssl_sha256}
     check_var ${OPENSSL_DOWNLOAD_URL}
     # Can't use curl here because we don't have it yet
-    curl -# -LO ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz
+    wget -q ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz
     check_sha256sum ${openssl_fname}.tar.gz ${openssl_sha256}
     tar -xzf ${openssl_fname}.tar.gz
     (cd ${openssl_fname} && do_openssl_build)
-    rm -rf ${openssl_fname} ${openssl_fname}.tar.gz /usr/ssl/man
+    rm -rf ${openssl_fname} ${openssl_fname}.tar.gz
+    # Cleanup install tree
+    rm -rf /usr/ssl/man
 }
 
 cd /usr/src

imagefiles/install-cmake-binary.sh

@@ -17,17 +17,17 @@ if [[ "${CMAKE_VERSION}" == "" ]]; then
   exit 1
 fi
 
-cd /tmp
+cd /usr/src
 
-filename=cmake-${CMAKE_VERSION}-Centos5-x86_64
-url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${filename}.tar.gz
+CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-x86_64
+url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz
 echo "Downloading $url"
 curl -# -LO $url
 
-tar -xzvf ${filename}.tar.gz
-rm -f ${filename}.tar.gz
+tar -xzvf ${CMAKE_ROOT}.tar.gz
+rm -f ${CMAKE_ROOT}.tar.gz
 
-cd ${filename}
+cd ${CMAKE_ROOT}
 
 rm -rf doc man
 rm -rf bin/cmake-gui