From 002c79ef51cc56b933e762de7af9ef8733b13707 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 17 Apr 2008 10:42:34 +0200
Subject: Some formating and style cleanups.
---
helpers/lh_binary_debian-installer | 14 ++++++++------
helpers/lh_chroot_localization | 8 ++++----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 41161b7..17793fc 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -279,7 +279,7 @@ then
Chroot "apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install ${DI_PACKAGES}"
mv chroot/binary.deb ./
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
+
if ls binary.deb/archives/*.deb > /dev/null 2>&1
then
for FILE in binary.deb/archives/*.deb
@@ -367,6 +367,7 @@ then
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
done
fi
+
if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1
then
for FILE in ../config/binary_local-udebs/*_all.udeb
@@ -457,18 +458,19 @@ then
fi
fi
-repack_initrd() {
+Repack_initrd()
+{
local TARGET_INITRD
TARGET_INITRD="${1}"
REPACK_TMPDIR="unpacked-initrd"
-
+
# cpio does not have a "extract to directory", so we must change directory
mkdir -p ${REPACK_TMPDIR}
cd ${REPACK_TMPDIR}
gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
cp ../config/binary_debian-installer/preseed.cfg .
- find | cpio -H newc -o | gzip -9 > ../${TARGET_INITRD}
+ find | cpio -H newc -o | gzip -9 > ../${TARGET_INITRD}
cd ..
rm -rf ${REPACK_TMPDIR}
@@ -477,11 +479,11 @@ repack_initrd() {
# Preseed d-i by repacking the initrd in certain situations
if [ "${USE_NETBOOT_DI}" = "yes" ] && [ -e config/binary_debian-installer/preseed.cfg ]
then
- repack_initrd "${DESTDIR}"/"${INITRD_DI}"
+ Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
then
- repack_initrd "${DESTDIR}"/"${INITRD_GI}"
+ Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
fi
fi
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index c4f4f45..4a69e99 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -617,11 +617,11 @@ then
;;
iceweasel)
- Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}"
+ Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}"
;;
kde)
- Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}"
+ Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}"
;;
koffice)
@@ -629,12 +629,12 @@ then
;;
openoffice)
- Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}"
+ Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}"
;;
esac
done
- Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
+ Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
# Restoring cache
--
cgit v1.0