1.1 --- a/scripts/functions Sat Aug 09 17:45:55 2008 +0000
1.2 +++ b/scripts/functions Sat Aug 09 17:46:56 2008 +0000
1.3 @@ -426,8 +426,8 @@
1.4 CT_DoGetFile() {
1.5 case "${_wget},${_curl}" in
1.6 ,) CT_DoError "Could find neither wget nor curl";;
1.7 - ,*) CT_DoGetFileCurl "$1" 2>&1 |CT_DoLog ALL;;
1.8 - *) CT_DoGetFileWget "$1" 2>&1 |CT_DoLog ALL;;
1.9 + ,*) CT_DoExecLog ALL CT_DoGetFileCurl "$1" 2>&1;;
1.10 + *) CT_DoExecLog ALL CT_DoGetFileWget "$1" 2>&1;;
1.11 esac
1.12 }
1.13
1.14 @@ -467,7 +467,7 @@
1.15 if [ -r "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" -a \
1.16 "${CT_FORCE_DOWNLOAD}" != "y" ]; then
1.17 CT_DoLog EXTRA "Got '${file}' from local storage"
1.18 - ln -sv "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}" |CT_DoLog ALL
1.19 + CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}"
1.20 return 0
1.21 fi
1.22 done
1.23 @@ -495,8 +495,8 @@
1.24 # it does NOT. If it did exist, we'd have been stopped
1.25 # above, when looking for local copies.
1.26 CT_DoLog EXTRA "Saving '${file}' to local storage"
1.27 - mv "${file}${ext}" "${CT_LOCAL_TARBALLS_DIR}" |CT_DoLog ALL
1.28 - ln -sv "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}" |CT_DoLog ALL
1.29 + CT_DoExecLog ALL mv "${file}${ext}" "${CT_LOCAL_TARBALLS_DIR}"
1.30 + CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}"
1.31 fi
1.32 CT_DoLog EXTRA "Got '${file}' from the LAN mirror"
1.33 return 0
1.34 @@ -518,8 +518,8 @@
1.35 # it does NOT. If it did exist, we'd have been stopped
1.36 # above, when looking for local copies.
1.37 CT_DoLog EXTRA "Saving '${file}' to local storage"
1.38 - mv "${file}${ext}" "${CT_LOCAL_TARBALLS_DIR}" |CT_DoLog ALL
1.39 - ln -sv "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}" |CT_DoLog ALL
1.40 + CT_DoExecLog ALL mv "${file}${ext}" "${CT_LOCAL_TARBALLS_DIR}"
1.41 + CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}"
1.42 fi
1.43 CT_DoLog EXTRA "Got '${file}' from the Internet"
1.44 return 0
1.45 @@ -574,9 +574,9 @@
1.46
1.47 CT_DoLog EXTRA "Extracting '${file}'"
1.48 case "${ext}" in
1.49 - .tar.bz2) tar xvjf "${full_file}" |CT_DoLog ALL;;
1.50 - .tar.gz|.tgz) tar xvzf "${full_file}" |CT_DoLog ALL;;
1.51 - .tar) tar xvf "${full_file}" |CT_DoLog ALL;;
1.52 + .tar.bz2) CT_DoExecLog ALL tar xvjf "${full_file}";;
1.53 + .tar.gz|.tgz) CT_DoExecLog ALL tar xvzf "${full_file}";;
1.54 + .tar) CT_DoExecLog ALL tar xvf "${full_file}";;
1.55 *) CT_Abort "Don't know how to handle '${file}': unknown extension" ;;
1.56 esac
1.57
1.58 @@ -617,7 +617,7 @@
1.59 for p in "${patch_dir}"/*.patch; do
1.60 if [ -f "${p}" ]; then
1.61 CT_DoLog DEBUG "Applying patch '${p}'"
1.62 - patch -g0 -F1 -p1 -f <"${p}" |CT_DoLog ALL
1.63 + CT_DoExecLog ALL patch -g0 -F1 -p1 -f <"${p}"
1.64 CT_TestAndAbort "Failed while applying patch file '${p}'" ${PIPESTATUS[0]} -ne 0
1.65 fi
1.66 done
1.67 @@ -629,6 +629,7 @@
1.68 for cfg in config_guess config_sub; do
1.69 eval ${cfg}="${CT_LIB_DIR}/tools/${cfg/_/.}"
1.70 [ -e "${CT_TOP_DIR}/tools/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/tools/${cfg/_/.}"
1.71 + # Can't use CT_DoExecLog because of the '{} \;' to be passed un-mangled to find
1.72 find . -type f -name "${cfg/_/.}" -exec cp -v "${!cfg}" {} \; |CT_DoLog ALL
1.73 done
1.74 fi
1.75 @@ -758,17 +759,17 @@
1.76
1.77 CT_DoLog DEBUG " Saving CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'"
1.78 CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
1.79 - tar cv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" . |CT_DoLog DEBUG
1.80 + CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" .
1.81 CT_Popd
1.82
1.83 CT_DoLog DEBUG " Saving CT_CC_CORE_SHARED_PREFIX_DIR='${CT_CC_CORE_SHARED_PREFIX_DIR}'"
1.84 CT_Pushd "${CT_CC_CORE_SHARED_PREFIX_DIR}"
1.85 - tar cv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}" . |CT_DoLog DEBUG
1.86 + CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}" .
1.87 CT_Popd
1.88
1.89 CT_DoLog DEBUG " Saving CT_PREFIX_DIR='${CT_PREFIX_DIR}'"
1.90 CT_Pushd "${CT_PREFIX_DIR}"
1.91 - tar cv${tar_opt}f "${state_dir}/prefix_dir.tar${tar_ext}" --exclude '*.log' . |CT_DoLog DEBUG
1.92 + CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/prefix_dir.tar${tar_ext}" --exclude '*.log' .
1.93 CT_Popd
1.94
1.95 if [ "${CT_LOG_TO_FILE}" = "y" ]; then
1.96 @@ -810,17 +811,17 @@
1.97
1.98 CT_DoLog DEBUG " Restoring CT_PREFIX_DIR='${CT_PREFIX_DIR}'"
1.99 CT_Pushd "${CT_PREFIX_DIR}"
1.100 - tar xv${tar_opt}f "${state_dir}/prefix_dir.tar${tar_ext}" |CT_DoLog DEBUG
1.101 + CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/prefix_dir.tar${tar_ext}"
1.102 CT_Popd
1.103
1.104 CT_DoLog DEBUG " Restoring CT_CC_CORE_SHARED_PREFIX_DIR='${CT_CC_CORE_SHARED_PREFIX_DIR}'"
1.105 CT_Pushd "${CT_CC_CORE_SHARED_PREFIX_DIR}"
1.106 - tar xv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}" |CT_DoLog DEBUG
1.107 + CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}"
1.108 CT_Popd
1.109
1.110 CT_DoLog DEBUG " Restoring CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'"
1.111 CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
1.112 - tar xv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" |CT_DoLog DEBUG
1.113 + CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}"
1.114 CT_Popd
1.115
1.116 # Restore the environment, discarding any error message