-#!/bin/sh
+#!/bin/bash
LFS_PKG_BASE="$(dirname $(pwd))/packages"
LFS_PKG_DIR="${LFS_PKG_BASE}/${LFS_STAGE}"
BLFS_XORG_URL="http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg"
XORG_URL="http://xorg.freedesktop.org/releases/individual"
-WGETCMD="wget --directory-prefix=${LFS_PKG_DIR} --timeout=15 --tries=3 -nc --continue --no-check-certificate -o ${WGET_LOG_FILE}"
+WGETCMD="wget --directory-prefix=${LFS_PKG_DIR} --timeout=15 --tries=3 -nc --continue --no-check-certificate --no-verbose --output-file=${WGET_LOG_FILE}"
LFS_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-lfs.html
BLFS_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-blfs.html
PATCHES_LIST_FILENAME=${2}
${WGETCMD} "${PATCHES_URL}/" &&
+
+ # Append log to global log file
+ cat ${WGET_LOG_FILE} >> ${LFS_LOG_FILE} &&
+
mv ${LFS_PKG_DIR}/index.html ${PATCHES_LIST_FILENAME}
}
echo "404 NOTFOUND"
return 0
elif grep "No such file" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then
+ echo "No such file"
return 0
else
return 1
MY_ARCH_EXT="tar.bz2 tar.gz tgz tar.Z"
fi
- echo " MY_ARCH_EXT=${MY_ARCH_EXT}"
-
for arch_ext in ${MY_ARCH_EXT}; do
# Don't take any chance: remove any partially downloaded file.
# If we arrive here, it means the final destination file was not found
# so we can safely remove any file prior to trying to download it.
rm -f ${LFS_PKG_DIR}/${PACK}.${arch_ext}
+ echo "Trying to fetch ${PACK}.${arch_ext}"
+
${WGETCMD} ${URL}/${PACK}.${arch_ext}
wget_status=$?
- # Failure: if it was a connection timeout, don't try for other file extensions.
+ # Append log to global log file
+ cat ${WGET_LOG_FILE} >> ${LFS_LOG_FILE}
+
+ # Failure: if it was a connection timeout, don't try for other file
+ # extensions.
if grep "failed: Connection timed out" ${WGET_LOG_FILE} 1> /dev/null 2>&1; then
echo "Error, wget reported: Connection timed out"
return 1
fi
if detect_file_not_found; then
- # Try next archive extension if web server reported that file is not found.
+ # Try next archive extension if web server reported that file is not
+ # found.
continue;
fi
# Options:
# -e File extension (default is tar.bz2)
# -d Fetch directory (default is LFS_PKG_DIR)
-# -f Filename (default is PACKAGE)
+# -f Filename on server (default is PACKAGE)
# -h Display this help and returns
# -s Subdirectory on server
fpkg()
# Check for available patches with PACKAGE (TARGET) name.
static_getpatch ${PACK}
- # Check for available patches with SRC_FILENAME name.
- static_getpatch ${SRC_FILENAME}
+ if [ ${SRC_FILENAME} != ${PACK} ]; then
+ # Check for available patches with SRC_FILENAME name.
+ static_getpatch ${SRC_FILENAME}
- # Rename any patch fetched (in fpkg call) and replace SOURCE by TARGET in
- # patch name.
- if ls ${LFS_PKG_DIR}/${SRC_FILENAME}-*.patch 1> /dev/null 2>&1; then
- rename ${SRC_FILENAME} ${PACK} ${LFS_PKG_DIR}/${SRC_FILENAME}-*.patch
+ # Rename any patch fetched (in fpkg call) and replace SOURCE by TARGET
+ # in patch name.
+ if ls ${LFS_PKG_DIR}/${SRC_FILENAME}-*.patch 1> /dev/null 2>&1; then
+ echo "CMD=${SRC_FILENAME} ${PACK} ${LFS_PKG_DIR}/${SRC_FILENAME}-*.patch"
+ rename ${SRC_FILENAME} ${PACK} ${LFS_PKG_DIR}/${SRC_FILENAME}-*.patch
+ fi
fi
}