wget: Update to 1.20.2

[ipfire-2.x.git] / src / scripts / archive.files

diff --git a/src/scripts/archive.files b/src/scripts/archive.files
index 8e276bac7f25e1f39782ef8310ea059c43dc0177..45de8c78de61aceffad284893ed23532dfb2e582 100755 (executable)
--- a/src/scripts/archive.files
+++ b/src/scripts/archive.files
@@ -19,10 +19,27 @@
 #                                                                             #
 ###############################################################################
 
+for i in BUILD_ARCH BUILDTARGET KVER; do
+       if [ -z "${!i}" ]; then
+               echo "${i} not set" >&2
+               exit 1
+       fi
+done
+
 FILELIST=
 
 for dir in $@; do
-       for exclude in ${dir}/${MACHINE}/*; do
+       # Skip all objects that do not exist.
+       [ -e "${dir}" ] || continue
+
+       # Files go directly to the rootfile.
+       if [ -f "${dir}" ]; then
+               FILELIST="${FILELIST} ${dir}"
+               continue
+       fi
+
+       for exclude in ${dir}/${BUILD_ARCH}/*; do
+               [ -f "${exclude}" ] || continue
                EXCLUDE="$EXCLUDE $exclude"
        done
 
@@ -41,5 +58,5 @@ for dir in $@; do
        done
 done
 
-cat ${FILELIST} | grep -v ^# | sort | uniq | \
-       sed -e "s/KVER/${KVER}/g" -e "s/MACHINE/${MACHINE}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"
+cat ${FILELIST} 2>/dev/null | grep -v ^# | sort | uniq | \
+       sed -e "s/KVER/${KVER}/g" -e "s/MACHINE/${BUILD_ARCH}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"