diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-05-04 14:29:22 +0000 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-05-04 14:29:22 +0000 |
| commit | b46b1d4308eb445dd0fd0162eb19169b9ca4af88 (patch) | |
| tree | 186f28c1dc8fe074d02646fd0f6e4faf5abdb06f | |
| parent | 840f6bf6698d71e09254f02f7871e5b8e34f3e58 (diff) | |
Remove -e and fix some indentions.
115 files changed, 16 insertions, 125 deletions
diff --git a/chapter5/binutils.sh b/chapter5/binutils.sh index 5176d0c..2d9da5b 100644 --- a/chapter5/binutils.sh +++ b/chapter5/binutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir build cd build || exit 1 diff --git a/chapter5/gcc.sh b/chapter5/gcc.sh index 62768be..53ef5f3 100644 --- a/chapter5/gcc.sh +++ b/chapter5/gcc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -p mpfr gmp mpc tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 diff --git a/chapter5/glibc.sh b/chapter5/glibc.sh index df39bc9..5ca82fe 100644 --- a/chapter5/glibc.sh +++ b/chapter5/glibc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e case $(uname -m) in i?86) ln -sfv ld-linux.so.2 "${LFS}"/lib/ld-lsb.so.3 diff --git a/chapter5/libstdc++.sh b/chapter5/libstdc++.sh index d8cb707..d1be7dd 100644 --- a/chapter5/libstdc++.sh +++ b/chapter5/libstdc++.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -v build cd build || exit 1 diff --git a/chapter5/linux-api-headers.sh b/chapter5/linux-api-headers.sh index 41d7cfc..3111625 100644 --- a/chapter5/linux-api-headers.sh +++ b/chapter5/linux-api-headers.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e make mrproper && make headers && diff --git a/chapter6/backup.sh b/chapter6/backup.sh index f9a761c..980c9ef 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e file="${LFS_VER}-ch6-backup.tar.xz" directories=(bin etc lib lib64 sbin tools usr var) diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 9251a89..c920026 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && ./configure --prefix=/usr \ diff --git a/chapter6/binutils.sh b/chapter6/binutils.sh index 3e4af1d..9b97c4b 100644 --- a/chapter6/binutils.sh +++ b/chapter6/binutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -v build cd build || exit 1 diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh index 2266d06..1ceea0a 100644 --- a/chapter6/cleanup.sh +++ b/chapter6/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e if [ -f "${LFS}/sources/chapter6/cleanup" ]; then printf "%b" " ${IGRN}Cleanup already performed${RST}\n" diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh index 86eaf5f..96c6e85 100644 --- a/chapter6/coreutils.sh +++ b/chapter6/coreutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e if [[ "$(uname -m)" = aarch64 ]]; then patch -Np1 -i ../coreutils-"${VERSION}"-aarch64_fixes-1.patch diff --git a/chapter6/diffutils.sh b/chapter6/diffutils.sh index 580d795..f6c45af 100644 --- a/chapter6/diffutils.sh +++ b/chapter6/diffutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ diff --git a/chapter6/file.sh b/chapter6/file.sh index 6d39e77..bd51747 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir build pushd build > /dev/null || exit 1 diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index 5617c10..0526c41 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 ./configure --prefix=/usr \ diff --git a/chapter6/gawk.sh b/chapter6/gawk.sh index 1d18cdc..29d7a8b 100644 --- a/chapter6/gawk.sh +++ b/chapter6/gawk.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/extras//' Makefile.in && ./configure --prefix=/usr \ diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh index 7c6be43..5160b45 100644 --- a/chapter6/gcc.sh +++ b/chapter6/gcc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -p isl mpfr gmp mpc tar -xf ../isl-*.tar.xz -C isl --strip-components=1 && diff --git a/chapter6/grep.sh b/chapter6/grep.sh index 7aaa38a..9aab0f4 100644 --- a/chapter6/grep.sh +++ b/chapter6/grep.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh index d8a45c7..f894df6 100644 --- a/chapter6/gzip.sh +++ b/chapter6/gzip.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" && diff --git a/chapter6/m4.sh b/chapter6/m4.sh index aeb1024..2f67ebe 100644 --- a/chapter6/m4.sh +++ b/chapter6/m4.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && diff --git a/chapter6/make.sh b/chapter6/make.sh index 0b2ace4..4de06b6 100644 --- a/chapter6/make.sh +++ b/chapter6/make.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --without-guile \ diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh index 1bf8824..6320a9f 100644 --- a/chapter6/ncurses.sh +++ b/chapter6/ncurses.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i s/mawk// configure && diff --git a/chapter6/patch.sh b/chapter6/patch.sh index 42add5e..fa1dac9 100644 --- a/chapter6/patch.sh +++ b/chapter6/patch.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/sed.sh b/chapter6/sed.sh index 7aaa38a..9aab0f4 100644 --- a/chapter6/sed.sh +++ b/chapter6/sed.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/tar.sh b/chapter6/tar.sh index 28aea9c..730d108 100644 --- a/chapter6/tar.sh +++ b/chapter6/tar.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/xz.sh b/chapter6/xz.sh index a519ebd..6766de1 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter7/backup.sh b/chapter7/backup.sh index b903897..ab3d894 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e file="${LFS_VER}-ch7-backup.tar.xz" directories=(bin dev etc lib lib64 proc run sbin sys tools usr var) diff --git a/chapter7/bison.sh b/chapter7/bison.sh index 9de734e..2385d22 100644 --- a/chapter7/bison.sh +++ b/chapter7/bison.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --docdir=/usr/share/doc/bison-"${VERSION}" && make && diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index 3e4dfa3..1652a7a 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e if [ -f "${LFS}/sources/chapter7/cleanup" ]; then printf "%b" " ${IGRN}Cleanup already performed${RST}\n" diff --git a/chapter7/gettext.sh b/chapter7/gettext.sh index 0e1771d..696cf25 100644 --- a/chapter7/gettext.sh +++ b/chapter7/gettext.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --disable-shared && make && diff --git a/chapter7/libstdc++.sh b/chapter7/libstdc++.sh index 1a0b5ee..de3a6b4 100644 --- a/chapter7/libstdc++.sh +++ b/chapter7/libstdc++.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ln -s gthr-posix.h libgcc/gthr-default.h && mkdir build diff --git a/chapter7/perl.sh b/chapter7/perl.sh index 627e3e5..970e17c 100644 --- a/chapter7/perl.sh +++ b/chapter7/perl.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e MAJMIN="$(cut -d\. -f1,2 <<< "${VERSION}")" diff --git a/chapter7/python.sh b/chapter7/python.sh index 428beaa..daf1677 100644 --- a/chapter7/python.sh +++ b/chapter7/python.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --enable-shared \ diff --git a/chapter7/texinfo.sh b/chapter7/texinfo.sh index b3bba9e..1935156 100644 --- a/chapter7/texinfo.sh +++ b/chapter7/texinfo.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && make && diff --git a/chapter7/util-linux.sh b/chapter7/util-linux.sh index e0241fa..7a00c8c 100644 --- a/chapter7/util-linux.sh +++ b/chapter7/util-linux.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -p /var/lib/hwclock && ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ diff --git a/chapter8/acl.sh b/chapter8/acl.sh index 516d861..57b6dd8 100644 --- a/chapter8/acl.sh +++ b/chapter8/acl.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/attr.sh b/chapter8/attr.sh index fc68246..22e7b79 100644 --- a/chapter8/attr.sh +++ b/chapter8/attr.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/autoconf.sh b/chapter8/autoconf.sh index cb58e2e..1f6d045 100644 --- a/chapter8/autoconf.sh +++ b/chapter8/autoconf.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/automake.sh b/chapter8/automake.sh index f30ffa6..73615bf 100644 --- a/chapter8/automake.sh +++ b/chapter8/automake.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i "s/''/etags/" t/tags-lisp-space.sh && diff --git a/chapter8/backup.sh b/chapter8/backup.sh index 4df6f79..789901e 100644 --- a/chapter8/backup.sh +++ b/chapter8/backup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e file="${LFS_VER}-ch8-backup.tar.xz" directories=(bin boot dev etc home lib lib64 media mnt opt proc root run sbin srv sys tmp usr var) diff --git a/chapter8/bash.sh b/chapter8/bash.sh index 23546ee..81d91c1 100644 --- a/chapter8/bash.sh +++ b/chapter8/bash.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 diff --git a/chapter8/bc.sh b/chapter8/bc.sh index c055edd..8d2b2f7 100644 --- a/chapter8/bc.sh +++ b/chapter8/bc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e CC=gcc ./configure.sh --prefix=/usr -G -O3 && diff --git a/chapter8/binutils.sh b/chapter8/binutils.sh index b5c5732..e3fe6c5 100644 --- a/chapter8/binutils.sh +++ b/chapter8/binutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e expect -c "spawn ls" diff --git a/chapter8/bison.sh b/chapter8/bison.sh index 75283ac..ab72461 100644 --- a/chapter8/bison.sh +++ b/chapter8/bison.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --docdir=/usr/share/doc/bison-"${VERSION}" && diff --git a/chapter8/bzip2.sh b/chapter8/bzip2.sh index c6b832a..1b35096 100644 --- a/chapter8/bzip2.sh +++ b/chapter8/bzip2.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 diff --git a/chapter8/check.sh b/chapter8/check.sh index 6b552e5..af09e33 100644 --- a/chapter8/check.sh +++ b/chapter8/check.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --disable-static && diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh index 12bbae4..84b42ee 100644 --- a/chapter8/cleanup.sh +++ b/chapter8/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e if [ -f "${LFS}/sources/chapter8/cleanup" ]; then printf "%b" " ${IGRN}Cleanup already performed${RST}\n" diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh index f024bc8..cd50083 100644 --- a/chapter8/coreutils.sh +++ b/chapter8/coreutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch && diff --git a/chapter8/d-bus.sh b/chapter8/d-bus.sh index d31a90d..4e77965 100644 --- a/chapter8/d-bus.sh +++ b/chapter8/d-bus.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/chapter8/dejagnu.sh b/chapter8/dejagnu.sh index 41ab6fc..273ab0f 100644 --- a/chapter8/dejagnu.sh +++ b/chapter8/dejagnu.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi && diff --git a/chapter8/diffutils.sh b/chapter8/diffutils.sh index cb58e2e..1f6d045 100644 --- a/chapter8/diffutils.sh +++ b/chapter8/diffutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh index b994c4e..48a9ead 100644 --- a/chapter8/e2fsprogs.sh +++ b/chapter8/e2fsprogs.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -v build cd build || exit 1 diff --git a/chapter8/eudev.sh b/chapter8/eudev.sh index 31e8a0c..bd6146f 100644 --- a/chapter8/eudev.sh +++ b/chapter8/eudev.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --bindir=/sbin \ diff --git a/chapter8/expat.sh b/chapter8/expat.sh index 433062c..e37a780 100644 --- a/chapter8/expat.sh +++ b/chapter8/expat.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/expect.sh b/chapter8/expect.sh index 7789eb5..62f4626 100644 --- a/chapter8/expect.sh +++ b/chapter8/expect.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --with-tcl=/usr/lib \ diff --git a/chapter8/file.sh b/chapter8/file.sh index 2c5b982..2c0622c 100644 --- a/chapter8/file.sh +++ b/chapter8/file.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && make && diff --git a/chapter8/findutils.sh b/chapter8/findutils.sh index 02fdf62..101f464 100644 --- a/chapter8/findutils.sh +++ b/chapter8/findutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 diff --git a/chapter8/flex.sh b/chapter8/flex.sh index bf62717..35f99de 100644 --- a/chapter8/flex.sh +++ b/chapter8/flex.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --docdir=/usr/share/doc/flex-"${VERSION}" \ diff --git a/chapter8/gawk.sh b/chapter8/gawk.sh index b6f25c5..3a25fc2 100644 --- a/chapter8/gawk.sh +++ b/chapter8/gawk.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/extras//' Makefile.in diff --git a/chapter8/gcc.sh b/chapter8/gcc.sh index 0a2bc8b..cde2db8 100644 --- a/chapter8/gcc.sh +++ b/chapter8/gcc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e case $(uname -m) in x86_64) diff --git a/chapter8/gdbm.sh b/chapter8/gdbm.sh index 4ecac48..b81ce81 100644 --- a/chapter8/gdbm.sh +++ b/chapter8/gdbm.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/gettext.sh b/chapter8/gettext.sh index 4685d27..df758da 100644 --- a/chapter8/gettext.sh +++ b/chapter8/gettext.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/glibc.sh b/chapter8/glibc.sh index 3392410..e344b47 100644 --- a/chapter8/glibc.sh +++ b/chapter8/glibc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 diff --git a/chapter8/gmp.sh b/chapter8/gmp.sh index f3adfe7..7ca2523 100644 --- a/chapter8/gmp.sh +++ b/chapter8/gmp.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # Uncomment for generic libraries # cp -v configfsf.guess config.guess diff --git a/chapter8/gperf.sh b/chapter8/gperf.sh index bb69b31..1806dd3 100644 --- a/chapter8/gperf.sh +++ b/chapter8/gperf.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-"${VERSION}" && diff --git a/chapter8/grep.sh b/chapter8/grep.sh index 5604bec..e567f51 100644 --- a/chapter8/grep.sh +++ b/chapter8/grep.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --bindir=/bin && diff --git a/chapter8/groff.sh b/chapter8/groff.sh index 73b4b93..f763a61 100644 --- a/chapter8/groff.sh +++ b/chapter8/groff.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e PAGE=letter ./configure --prefix=/usr && diff --git a/chapter8/grub.sh b/chapter8/grub.sh index 128cdb9..693adcd 100644 --- a/chapter8/grub.sh +++ b/chapter8/grub.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed "s/gold-version/& -R .note.gnu.property/" \ -i Makefile.in grub-core/Makefile.in && diff --git a/chapter8/gzip.sh b/chapter8/gzip.sh index f72a689..f762cf3 100644 --- a/chapter8/gzip.sh +++ b/chapter8/gzip.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/iana-etc.sh b/chapter8/iana-etc.sh index be58311..8576a80 100644 --- a/chapter8/iana-etc.sh +++ b/chapter8/iana-etc.sh @@ -1,4 +1,3 @@ #!/bin/bash -set -e cp -v services protocols /etc diff --git a/chapter8/inetutils.sh b/chapter8/inetutils.sh index 572c9e9..e8722aa 100644 --- a/chapter8/inetutils.sh +++ b/chapter8/inetutils.sh @@ -1,7 +1,6 @@ #!/bin/bash -set -e -./configure --prefix=/usr \ +./consigure --prefix=/usr \ --localstatedir=/var \ --disable-logger \ --disable-whois \ diff --git a/chapter8/intltool.sh b/chapter8/intltool.sh index 758f568..527e46a 100644 --- a/chapter8/intltool.sh +++ b/chapter8/intltool.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's:\\\${:\\\$\\{:' intltool-update.in && diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh index 8612d5d..8034496 100644 --- a/chapter8/iproute2.sh +++ b/chapter8/iproute2.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i /ARPD/d Makefile && rm -fv man/man8/arpd.8 && diff --git a/chapter8/isl.sh b/chapter8/isl.sh index 7526c2f..2ff6dba 100644 --- a/chapter8/isl.sh +++ b/chapter8/isl.sh @@ -1,9 +1,8 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ - --disable-static \ - --docdir=/usr/share/doc/isl-"${VERSION}" && + --disable-static \ + --docdir=/usr/share/doc/isl-"${VERSION}" && make && make html && diff --git a/chapter8/kbd.sh b/chapter8/kbd.sh index 3e76d8c..00a7397 100644 --- a/chapter8/kbd.sh +++ b/chapter8/kbd.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e patch -Np1 -i ../kbd-"${VERSION}"-backspace-1.patch && diff --git a/chapter8/kmod.sh b/chapter8/kmod.sh index 036a8fc..3435179 100644 --- a/chapter8/kmod.sh +++ b/chapter8/kmod.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --bindir=/bin \ diff --git a/chapter8/less.sh b/chapter8/less.sh index 6f357a9..01a6cb7 100644 --- a/chapter8/less.sh +++ b/chapter8/less.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --sysconfdir=/etc && diff --git a/chapter8/libcap.sh b/chapter8/libcap.sh index 33d374c..a67b607 100644 --- a/chapter8/libcap.sh +++ b/chapter8/libcap.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i '/install -m.*STA/d' libcap/Makefile && diff --git a/chapter8/libelf.sh b/chapter8/libelf.sh index e5323e0..cc8798f 100644 --- a/chapter8/libelf.sh +++ b/chapter8/libelf.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-debuginfod \ diff --git a/chapter8/libffi.sh b/chapter8/libffi.sh index ed8b1e5..1a5b45a 100644 --- a/chapter8/libffi.sh +++ b/chapter8/libffi.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --disable-static --with-gcc-arch=native && diff --git a/chapter8/libpipeline.sh b/chapter8/libpipeline.sh index cb58e2e..1f6d045 100644 --- a/chapter8/libpipeline.sh +++ b/chapter8/libpipeline.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/libtool.sh b/chapter8/libtool.sh index a654e29..a4c9dd5 100644 --- a/chapter8/libtool.sh +++ b/chapter8/libtool.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/m4.sh b/chapter8/m4.sh index 8c6201b..5174f00 100644 --- a/chapter8/m4.sh +++ b/chapter8/m4.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && diff --git a/chapter8/make.sh b/chapter8/make.sh index cb58e2e..1f6d045 100644 --- a/chapter8/make.sh +++ b/chapter8/make.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/man-db.sh b/chapter8/man-db.sh index 8076622..bcf27bb 100644 --- a/chapter8/man-db.sh +++ b/chapter8/man-db.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --docdir=/usr/share/doc/man-db-"${VERSION}" \ diff --git a/chapter8/man-pages.sh b/chapter8/man-pages.sh index c019094..db9dad4 100644 --- a/chapter8/man-pages.sh +++ b/chapter8/man-pages.sh @@ -1,4 +1,3 @@ #!/bin/bash -set -e make -j1 install diff --git a/chapter8/meson.sh b/chapter8/meson.sh index b1aa296..0aa9797 100644 --- a/chapter8/meson.sh +++ b/chapter8/meson.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e python3 setup.py build && diff --git a/chapter8/mpc.sh b/chapter8/mpc.sh index 009662c..793fab5 100644 --- a/chapter8/mpc.sh +++ b/chapter8/mpc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/mpfr.sh b/chapter8/mpfr.sh index c76276e..99fd5fe 100644 --- a/chapter8/mpfr.sh +++ b/chapter8/mpfr.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --disable-static \ diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh index 2b82d69..d42cf49 100644 --- a/chapter8/ncurses.sh +++ b/chapter8/ncurses.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --mandir=/usr/share/man \ @@ -8,8 +7,8 @@ set -e --without-normal \ --enable-pc-files \ --enable-widec \ - --with-termlib \ - --disable-tic-depends && + --with-termlib \ + --disable-tic-depends && make && make -j1 install && diff --git a/chapter8/ninja.sh b/chapter8/ninja.sh index f4f1017..e778780 100644 --- a/chapter8/ninja.sh +++ b/chapter8/ninja.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e export NINJAJOBS=4 diff --git a/chapter8/openssl.sh b/chapter8/openssl.sh index 59699f5..b5b85dd 100644 --- a/chapter8/openssl.sh +++ b/chapter8/openssl.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./config --prefix=/usr \ --openssldir=/etc/ssl \ diff --git a/chapter8/patch.sh b/chapter8/patch.sh index cb58e2e..1f6d045 100644 --- a/chapter8/patch.sh +++ b/chapter8/patch.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/perl.sh b/chapter8/perl.sh index 7e5cbc7..0fb9e3f 100644 --- a/chapter8/perl.sh +++ b/chapter8/perl.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e MAJMIN="$(cut -d\. -f1,2 <<< "${VERSION}")" diff --git a/chapter8/pkg-config.sh b/chapter8/pkg-config.sh index e404f44..b56df73 100644 --- a/chapter8/pkg-config.sh +++ b/chapter8/pkg-config.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --with-internal-glib \ diff --git a/chapter8/procps-ng.sh b/chapter8/procps-ng.sh index 630cfe4..c1f8d15 100644 --- a/chapter8/procps-ng.sh +++ b/chapter8/procps-ng.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --exec-prefix= \ @@ -7,7 +6,7 @@ set -e --docdir=/usr/share/doc/procps-ng-"${VERSION}" \ --disable-static \ --disable-kill \ - --with-systemd && + --with-systemd && make && diff --git a/chapter8/psmisc.sh b/chapter8/psmisc.sh index e06ef92..4ac6405 100644 --- a/chapter8/psmisc.sh +++ b/chapter8/psmisc.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/python.sh b/chapter8/python.sh index 04af366..a04a3d4 100644 --- a/chapter8/python.sh +++ b/chapter8/python.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed 's|cpython/||' -i Include/cpython/pystate.h && diff --git a/chapter8/readline.sh b/chapter8/readline.sh index 4b2569e..80c9709 100644 --- a/chapter8/readline.sh +++ b/chapter8/readline.sh @@ -1,5 +1,6 @@ #!/bin/bash -set -e + +exit 1 sed -i '/MV.*old/d' Makefile.in && sed -i '/{OLDSUFF}/c:' support/shlib-install && diff --git a/chapter8/sed.sh b/chapter8/sed.sh index 6b2d3d7..f41cce5 100644 --- a/chapter8/sed.sh +++ b/chapter8/sed.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr --bindir=/bin && diff --git a/chapter8/shadow.sh b/chapter8/shadow.sh index 075caad..ba1daa7 100644 --- a/chapter8/shadow.sh +++ b/chapter8/shadow.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 ROOTPW='$1$5RPAAd$oejpw8ErihLIB7vmGE4SV1' diff --git a/chapter8/sysklogd.sh b/chapter8/sysklogd.sh index 26c2394..f9c093f 100644 --- a/chapter8/sysklogd.sh +++ b/chapter8/sysklogd.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c && sed -i 's/union wait/int/' syslogd.c && diff --git a/chapter8/systemd.sh b/chapter8/systemd.sh index a9c8172..98137a9 100644 --- a/chapter8/systemd.sh +++ b/chapter8/systemd.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed '177,222 d' -i src/resolve/meson.build && sed -i 's/GROUP="render"/GROUP="video"/' rules.d/50-udev-default.rules.in && diff --git a/chapter8/sysvinit.sh b/chapter8/sysvinit.sh index 0c0c2db..f33bfe0 100644 --- a/chapter8/sysvinit.sh +++ b/chapter8/sysvinit.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e patch -Np1 -i ../sysvinit-"${VERSION}"-consolidated-1.patch && diff --git a/chapter8/tar.sh b/chapter8/tar.sh index 44df8a1..076f17d 100644 --- a/chapter8/tar.sh +++ b/chapter8/tar.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e FORCE_UNSAFE_CONFIGURE=1 \ ./configure --prefix=/usr \ diff --git a/chapter8/tcl.sh b/chapter8/tcl.sh index 244817a..ff446de 100644 --- a/chapter8/tcl.sh +++ b/chapter8/tcl.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e tar -xf ../tcl"${VERSION}"-html.tar.gz --strip-components=1 && diff --git a/chapter8/texinfo.sh b/chapter8/texinfo.sh index 87b0aae..f5edef4 100644 --- a/chapter8/texinfo.sh +++ b/chapter8/texinfo.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && diff --git a/chapter8/util-linux.sh b/chapter8/util-linux.sh index 6e3c0ff..1c5133c 100644 --- a/chapter8/util-linux.sh +++ b/chapter8/util-linux.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-"${VERSION}" \ diff --git a/chapter8/vim.sh b/chapter8/vim.sh index 39bb932..afec4ed 100644 --- a/chapter8/vim.sh +++ b/chapter8/vim.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h && diff --git a/chapter8/xml-parser.sh b/chapter8/xml-parser.sh index ffaa526..0164c33 100644 --- a/chapter8/xml-parser.sh +++ b/chapter8/xml-parser.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e perl Makefile.PL && diff --git a/chapter8/xz.sh b/chapter8/xz.sh index 4d567c8..4fbe922 100644 --- a/chapter8/xz.sh +++ b/chapter8/xz.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ diff --git a/chapter8/zlib.sh b/chapter8/zlib.sh index df67074..4de64f9 100644 --- a/chapter8/zlib.sh +++ b/chapter8/zlib.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr && make && diff --git a/chapter8/zstd.sh b/chapter8/zstd.sh index 611785e..8dc163c 100644 --- a/chapter8/zstd.sh +++ b/chapter8/zstd.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e make && make prefix=/usr -j1 install && diff --git a/functions.sh b/functions.sh index 5d7bae6..20bb871 100644 --- a/functions.sh +++ b/functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +#set -e download() { diff --git a/insidechroot.sh b/insidechroot.sh index b508ec1..ee57877 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +#set -e CHAPTER="$1" @@ -61,7 +61,7 @@ elif [[ "${CHAPTER}" -eq 10 ]]; then printf "%b" "${GRN}Creating fstab configuration${RST}\n" source chapter10/fstab.sh - source packageinstall.sh 10 linux + #source packageinstall.sh 10 linux retval=$? if [[ "${retval}" -ne 0 ]]; then exit 1 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +#set -e set -u clear diff --git a/packageinstall.sh b/packageinstall.sh index f8e71c4..af91415 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +#set -e CHAPTER="$1" PACKAGE="$2" @@ -17,9 +17,9 @@ else VERSION="$(echo "${line}" | cut -d\, -f2)" URL="$(echo "${line}" | cut -d\, -f3 | sed "s/@/${VERSION}/g")" CACHEFILE="$(basename "${URL}")" - DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" + DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" - # Remove existing if exists + # Remove existing if exists rm -rf "${DIRNAME}" printf "%b" "${IBLU}Extracting ${YLW}${CACHEFILE}${RST}... " @@ -44,7 +44,7 @@ else spinner "$pid" "${SPINNER}" retval=$? if [[ "$retval" -ne 0 ]]; then - fail "FAILED!" + fail "FAILED!" popd > /dev/null || return 1 return $retval else |