1 files changed, 21 insertions, 0 deletions
diff --git a/chapter8/bash.sh b/chapter8/bash.sh
index 73de0bf..ee7124f 100644
--- a/chapter8/bash.sh
+++ b/chapter8/bash.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 # shellcheck disable=SC2016
 
@@ -16,3 +17,23 @@ make -j1 install &&
 mv -vf /usr/bin/bash /bin
 
 #exec /bin/bash --login +h
+=======
+#!/bin/bash
+# shellcheck disable=SC2016
+
+patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch &&
+
+sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in &&
+
+./configure --prefix=/usr \
+            --docdir=/usr/share/doc/bash-"${VERSION}" \
+            --without-bash-malloc \
+            --with-installed-readline &&
+
+make &&
+
+make -j1 install &&
+mv -vf /usr/bin/bash /bin
+
+#exec /bin/bash --login +h
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28