scripts/functions: fix extraction

This commit is contained in:
Yann E. MORIN" 2010-01-09 17:31:25 +01:00
parent fbd2a88e6e
commit 28d1a52859

View File

@ -577,6 +577,12 @@ CT_Extract() {
fi fi
local full_file="${CT_TARBALLS_DIR}/${basename}${ext}" local full_file="${CT_TARBALLS_DIR}/${basename}${ext}"
# Check if already extracted
if [ -e "${CT_SRC_DIR}/.${basename}.extracted" ]; then
CT_DoLog DEBUG "Already extracted '${basename}'"
return 0
fi
# Check if previously partially extracted # Check if previously partially extracted
if [ -e "${CT_SRC_DIR}/.${basename}.extracting" ]; then if [ -e "${CT_SRC_DIR}/.${basename}.extracting" ]; then
CT_DoLog ERROR "The '${basename}' sources were partially extracted." CT_DoLog ERROR "The '${basename}' sources were partially extracted."
@ -587,12 +593,6 @@ CT_Extract() {
fi fi
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.extracting" CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.extracting"
# Check if already extracted
if [ -e "${CT_SRC_DIR}/.${basename}.extracted" ]; then
CT_DoLog DEBUG "Already extracted '${basename}'"
return 0
fi
[ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}" [ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}"
CT_DoLog EXTRA "Extracting '${basename}'" CT_DoLog EXTRA "Extracting '${basename}'"
@ -683,8 +683,8 @@ CT_Patch() {
done done
fi fi
CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched" CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched"
CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
[ "${nochdir}" = "nochdir" ] || CT_Popd [ "${nochdir}" = "nochdir" ] || CT_Popd
} }