summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-09 16:31:25 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-09 16:31:25 (GMT)
commit28d1a52859bc7ec419dea1af2e754ba327c03f23 (patch)
tree05a2a088c1c8c214fa538d5c264d1e2b3fb83a77
parentfbd2a88e6e5579f7c014cc48b866c782534bf004 (diff)
scripts/functions: fix extraction
-rw-r--r--scripts/functions14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions
index c7b1047..4b279ac 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -577,6 +577,12 @@ CT_Extract() {
fi
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
if [ -e "${CT_SRC_DIR}/.${basename}.extracting" ]; then
CT_DoLog ERROR "The '${basename}' sources were partially extracted."
@@ -587,12 +593,6 @@ CT_Extract() {
fi
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}"
CT_DoLog EXTRA "Extracting '${basename}'"
@@ -683,8 +683,8 @@ CT_Patch() {
done
fi
- CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched"
+ CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
[ "${nochdir}" = "nochdir" ] || CT_Popd
}