Fix a small typo when extracting non-compressed steps.
Have a go for a sane handlign of tar options and extensions.
1.1 --- a/scripts/functions Sun Aug 12 08:43:56 2007 +0000
1.2 +++ b/scripts/functions Sun Aug 12 15:18:09 2007 +0000
1.3 @@ -546,8 +546,8 @@
1.4 mkdir -p "${state_dir}"
1.5
1.6 case "${CT_DEBUG_CT_SAVE_STEPS_GZIP}" in
1.7 - y) tar_opt=czf; tar_ext=".tar.gz";;
1.8 - *) tar_opt=cf; tar_ext=".tar";;
1.9 + y) tar_opt=z; tar_ext=.gz;;
1.10 + *) tar_opt=; tar_ext=;;
1.11 esac
1.12
1.13 CT_DoLog DEBUG " Saving environment and aliases"
1.14 @@ -561,17 +561,17 @@
1.15
1.16 CT_DoLog DEBUG " Saving CT_CC_CORE_STATIC_PREFIX_DIR=\"${CT_CC_CORE_STATIC_PREFIX_DIR}\""
1.17 CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
1.18 - tar ${tar_opt} "${state_dir}/cc_core_static_prefix_dir${tar_ext}" .
1.19 + tar cv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" . |CT_DoLog DEBUG
1.20 CT_Popd
1.21
1.22 CT_DoLog DEBUG " Saving CT_CC_CORE_SHARED_PREFIX_DIR=\"${CT_CC_CORE_SHARED_PREFIX_DIR}\""
1.23 CT_Pushd "${CT_CC_CORE_SHARED_PREFIX_DIR}"
1.24 - tar ${tar_opt} "${state_dir}/cc_core_shared_prefix_dir${tar_ext}" .
1.25 + tar cv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}" . |CT_DoLog DEBUG
1.26 CT_Popd
1.27
1.28 CT_DoLog DEBUG " Saving CT_PREFIX_DIR=\"${CT_PREFIX_DIR}\""
1.29 CT_Pushd "${CT_PREFIX_DIR}"
1.30 - tar ${tar_opt} "${state_dir}/prefix_dir${tar_ext}" --exclude '*.log' .
1.31 + tar cv${tar_opt}f "${state_dir}/prefix_dir.tar${tar_ext}" --exclude '*.log' . |CT_DoLog DEBUG
1.32 CT_Popd
1.33
1.34 if [ "${CT_LOG_TO_FILE}" = "y" ]; then
1.35 @@ -602,8 +602,8 @@
1.36 CT_DoLog INFO "Restoring state at step \"${state_name}\", as requested."
1.37
1.38 case "${CT_DEBUG_CT_SAVE_STEPS_GZIP}" in
1.39 - y) tar_opt=xzf; tar_ext=".tar.gz";;
1.40 - *) tar_opt=cf; tar_ext=".tar";;
1.41 + y) tar_opt=z; tar_ext=.gz;;
1.42 + *) tar_opt=; tar_ext=;;
1.43 esac
1.44
1.45 CT_DoLog DEBUG " Removing previous build directories"
1.46 @@ -613,17 +613,17 @@
1.47
1.48 CT_DoLog DEBUG " Restoring CT_PREFIX_DIR=\"${CT_PREFIX_DIR}\""
1.49 CT_Pushd "${CT_PREFIX_DIR}"
1.50 - tar ${tar_opt} "${state_dir}/prefix_dir${tar_ext}"
1.51 + tar xv${tar_opt}f "${state_dir}/prefix_dir$.tar{tar_ext}" |CT_DoLog DEBUG
1.52 CT_Popd
1.53
1.54 CT_DoLog DEBUG " Restoring CT_CC_CORE_SHARED_PREFIX_DIR=\"${CT_CC_CORE_SHARED_PREFIX_DIR}\""
1.55 CT_Pushd "${CT_CC_CORE_SHARED_PREFIX_DIR}"
1.56 - tar ${tar_opt} "${state_dir}/cc_core_shared_prefix_dir${tar_ext}"
1.57 + tar xv${tar_opt}f "${state_dir}/cc_core_shared_prefix_dir.tar${tar_ext}" |CT_DoLog DEBUG
1.58 CT_Popd
1.59
1.60 CT_DoLog DEBUG " Restoring CT_CC_CORE_STATIC_PREFIX_DIR=\"${CT_CC_CORE_STATIC_PREFIX_DIR}\""
1.61 CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
1.62 - tar ${tar_opt} "${state_dir}/cc_core_static_prefix_dir${tar_ext}"
1.63 + tar xv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" |CT_DoLog DEBUG
1.64 CT_Popd
1.65
1.66 # Restore the environment, discarding any error message