summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_includes
diff options
context:
space:
mode:
authorAntonio Terceiro <terceiro@softwarelivre.org>2008-08-08 22:20:56 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:37 +0100
commit7f1a4e4fc50c636d187472388924109e853ec69e (patch)
treef07000b79efde785760d3cd4247209b0ba483401 /helpers/lh_binary_includes
parent382d244050abbfb9f9e52ec9383d333b158ded5d (diff)
downloadvyos-live-build-7f1a4e4fc50c636d187472388924109e853ec69e.tar.gz
vyos-live-build-7f1a4e4fc50c636d187472388924109e853ec69e.zip
Replacing file checking with ls by function calls
Instead of repeatedly doing "ls ... > /dev/null 2>&1", just use a function that does exactly that.
Diffstat (limited to 'helpers/lh_binary_includes')
-rwxr-xr-xhelpers/lh_binary_includes12
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index f97d735f7..d2086b818 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -96,26 +96,26 @@ fi
# Copying common templates
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* > /dev/null 2>&1
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
fi
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* > /dev/null 2>&1
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
fi
# Copying live templates
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* > /dev/null 2>&1
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
fi
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* > /dev/null 2>&1
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
fi
@@ -124,13 +124,13 @@ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
# Copying install templates
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
- ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* > /dev/null 2>&1
+ Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
fi
if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
- ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* > /dev/null 2>&1
+ Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/*
then
cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
fi