From d6de6e3bc5bc4d5f3c8799df33d876116bddef14 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 14 Apr 2021 16:37:15 -0500
Subject: Use AND lists and remove set -e
---
chapter8/coreutils.sh | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
(limited to 'chapter8/coreutils.sh')
diff --git a/chapter8/coreutils.sh b/chapter8/coreutils.sh
index 1bbc0f3..7909f26 100644
--- a/chapter8/coreutils.sh
+++ b/chapter8/coreutils.sh
@@ -1,24 +1,22 @@
#!/bin/bash
-set -e
-patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch
+patch -Np1 -i ../coreutils-"${VERSION}"-i18n-1.patch &&
-sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
+sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk &&
-autoreconf -fiv
+autoreconf -fiv &&
FORCE_UNSAFE_CONFIGURE=1 ./configure \
--prefix=/usr \
- --enable-no-install-program=kill,uptime
+ --enable-no-install-program=kill,uptime &&
-make
+make &&
-make -j1 install
-
-mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
-mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
-mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
-mv -v /usr/bin/chroot /usr/sbin
-mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
-sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8
+make -j1 install &&
+mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin &&
+mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin &&
+mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin &&
+mv -v /usr/bin/chroot /usr/sbin &&
+mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8 &&
+sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8 &&
mv -v /usr/bin/{head,nice,sleep,touch} /bin
--
cgit v1.2.3-54-g00ecf