manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some formating and style cleanups.

This commit is contained in:
Daniel Baumann 2008-04-17 10:42:34 +02:00
parent dd470ea575
commit 734762fcf1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helpers/lh_binary_debian-installer
View File

@ -279,7 +279,7 @@ then
Chroot "apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install ${DI_PACKAGES}" Chroot "apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install ${DI_PACKAGES}"
mv chroot/binary.deb ./ mv chroot/binary.deb ./
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
if ls binary.deb/archives/*.deb > /dev/null 2>&1 if ls binary.deb/archives/*.deb > /dev/null 2>&1
then then
for FILE in binary.deb/archives/*.deb for FILE in binary.deb/archives/*.deb
@ -367,6 +367,7 @@ then
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
done done
fi fi
if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1 if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1
then then
for FILE in ../config/binary_local-udebs/*_all.udeb for FILE in ../config/binary_local-udebs/*_all.udeb
@ -457,18 +458,19 @@ then
fi fi
fi fi
repack_initrd() { Repack_initrd()
{
local TARGET_INITRD local TARGET_INITRD
TARGET_INITRD="${1}" TARGET_INITRD="${1}"
REPACK_TMPDIR="unpacked-initrd" REPACK_TMPDIR="unpacked-initrd"
# cpio does not have a "extract to directory", so we must change directory # cpio does not have a "extract to directory", so we must change directory
mkdir -p ${REPACK_TMPDIR} mkdir -p ${REPACK_TMPDIR}
cd ${REPACK_TMPDIR} cd ${REPACK_TMPDIR}
gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
cp ../config/binary_debian-installer/preseed.cfg . 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 .. cd ..
rm -rf ${REPACK_TMPDIR} rm -rf ${REPACK_TMPDIR}
@ -477,11 +479,11 @@ repack_initrd() {
# Preseed d-i by repacking the initrd in certain situations # Preseed d-i by repacking the initrd in certain situations
if [ "${USE_NETBOOT_DI}" = "yes" ] && [ -e config/binary_debian-installer/preseed.cfg ] if [ "${USE_NETBOOT_DI}" = "yes" ] && [ -e config/binary_debian-installer/preseed.cfg ]
then then
repack_initrd "${DESTDIR}"/"${INITRD_DI}" Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
if [ -e "${DESTDIR}"/"${INITRD_GI}" ] if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
then then
repack_initrd "${DESTDIR}"/"${INITRD_GI}" Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
fi fi
fi fi

8
helpers/lh_chroot_localization
View File

@ -617,11 +617,11 @@ then
;; ;;
iceweasel) 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) 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) koffice)
@ -629,12 +629,12 @@ then
;; ;;
openoffice) 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 esac
done 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 Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
# Restoring cache # Restoring cache