local PATCHES_LIST=${2}
local PATCHES_URL=${3}
- local PATCHES_FOUND=$(cat ${PATCHES_LIST} | grep "${PACK}-" | sed "s/.*\(${PACK}-.*\.patch\).*/\1/")
+ # Remplace les "+" par "%2B"
+ local PACK_URL=$(echo $PACK | sed s!\+!%2B!g)
+
+ local PATCHES_FOUND=$(cat ${PATCHES_LIST} | grep "${PACK_URL}-" | sed "s/.*\(${PACK_URL}-.*\.patch\).*/\1/")
if [ -n "${PATCHES_FOUND}" ]; then
for p in ${PATCHES_FOUND}; do
- if [ ! -f ${LFS_PKG_DIR}/${p} ]; then
- rcmd "Fetching ${p} from ${PATCHES_URL}" ${WGETCMD} ${PATCHES_URL}/${p}
+ # Remplace les "%2B" par "+"
+ PATCH_NAME=$(echo ${p} | sed s!%2B!\+!g)
+
+ if [ ! -f ${LFS_PKG_DIR}/${PATCH_NAME} ]; then
+ rcmd "Fetching ${PATCH_NAME} from ${PATCHES_URL}" ${WGETCMD} ${PATCHES_URL}/${p}
fi
done
fi
# so we can safely remove any file prior to trying to download it.
rm -f ${LFS_PKG_DIR}/${PACK}.${arch_ext}
- echo "Tryng to fetch ${PACK}.${arch_ext}"
-
- ${WGETCMD} ${URL}/${PACK}.${arch_ext}
+ rcmd "Fetching ${PACK}.${arch_ext}" ${WGETCMD} ${URL}/${PACK}.${arch_ext}
wget_status=$?
# Append log to global log file
return 1
fi
- # If we arrive here, it means we were able to successfully download the file.
- if [ "x${arch_ext}" = "xtar.gz" -o "x${arch_ext}" = "xtgz" -o "x${arch_ext}" = "xtar.Z" ]; then
+ # If we are here, it means the file was successfully downloaded.
+ if [ "x${arch_ext}" = "xtar.gz" -o "x${arch_ext}" = "xtgz" \
+ -o "x${arch_ext}" = "xtar.Z" ]; then
gztobz2 ${LFS_PKG_DIR}/${PACK}.${arch_ext}
fi
return $?
local PACK=${1}
local URL=${2}
- local FETCH_STRING="Fetching ${PACK}"
if [ -z "${SRC_FILENAME}" ]; then
# Default source filename = name of package
SRC_FILENAME=${PACK}
fi
- if [ -n "${FILE_EXT}" ]; then
- FETCH_STRING="${FETCH_STRING}.${FILE_EXT}"
- fi
-
if [ -z "${FILE_EXT}" -o \
"x${FILE_EXT}" = "xtar.gz" -o \
"x${FILE_EXT}" = "xtgz" -o \
DEST_FILE=${DEST_DIR}/${PACK}.${FINAL_EXT}
if [ ! -f ${DEST_FILE} ]; then
- rcmd "${FETCH_STRING}" static_getpkg ${SRC_FILENAME} ${URL} ${FILE_EXT}
+ set +e
+ static_getpkg ${SRC_FILENAME} ${URL} ${FILE_EXT}
+ set -e
# Move file if source filename is not equal to package name and/or destination
# directory is not the default: