r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

bleugh

Browse Source
This commit is contained in:
brent s. 2016-12-02 04:15:07 -05:00
parent 0c19a797fd
commit f12bb7799d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extra/pre-build.d/root/pre-build.sh
View File

@ -64,7 +64,7 @@ else
TGT_ARCH='i686' TGT_ARCH='i686'
fi fi
# Install some stuff we need for the ISO. # Install some stuff we need for the ISO.
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/iso.pkgs.both | tr '\n' ' ') PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.both | tr '\n' ' ')
if [[ -n "${PKGLIST}" ]]; if [[ -n "${PKGLIST}" ]];
then then
apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST} apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@ -72,7 +72,7 @@ then
cleanPacorigs cleanPacorigs
fi fi
# And install arch-specific packages for the ISO, if there are any. # And install arch-specific packages for the ISO, if there are any.
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/iso.pkgs.arch | tr '\n' ' ') PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.arch | tr '\n' ' ')
if [[ -n "${PKGLIST}" ]]; if [[ -n "${PKGLIST}" ]];
then then
apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST} apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@ -89,7 +89,7 @@ mv -f /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
cleanPacorigs cleanPacorigs


# And install EXTRA functionality packages, if there are any. # And install EXTRA functionality packages, if there are any.
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.both | tr '\n' ' ') PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.both | tr '\n' ' ')
if [[ -n "${PKGLIST}" ]]; if [[ -n "${PKGLIST}" ]];
then then
apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST} apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@ -127,7 +127,7 @@ fi
cleanPacorigs cleanPacorigs
mv -f /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img mv -f /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
# And install arch-specific extra packages, if there are any. # And install arch-specific extra packages, if there are any.
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.arch | tr '\n' ' ') PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.arch | tr '\n' ' ')
if [[ -n "${PKGLIST}" ]]; if [[ -n "${PKGLIST}" ]];
then then
apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST} apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}