aboutsummaryrefslogtreecommitdiffstats
path: root/chapter8/tcl.sh
diff options
context:
space:
mode:
authorWilliam Harrington <kb0iic@berzerkula.org>2021-04-14 16:37:15 -0500
committerWilliam Harrington <kb0iic@berzerkula.org>2021-04-14 16:37:15 -0500
commitd6de6e3bc5bc4d5f3c8799df33d876116bddef14 (patch)
tree3ada7dd247cdc9fa1f6085d06a36e1b542f4e0b8 /chapter8/tcl.sh
parente5cb063449df5491af4861744b80c6ea40e7cac3 (diff)
Use AND lists and remove set -e
Diffstat (limited to 'chapter8/tcl.sh')
-rw-r--r--chapter8/tcl.sh21
1 files changed, 10 insertions, 11 deletions
diff --git a/chapter8/tcl.sh b/chapter8/tcl.sh
index a02aa61..ba630df 100644
--- a/chapter8/tcl.sh
+++ b/chapter8/tcl.sh
@@ -1,36 +1,35 @@
#!/bin/bash
-set -e
-tar -xf ../tcl"${VERSION}"-html.tar.gz --strip-components=1
+tar -xf ../tcl"${VERSION}"-html.tar.gz --strip-components=1 &&
SRCDIR=$(pwd)
cd unix || exit 1
./configure --prefix=/usr \
--mandir=/usr/share/man \
- "$([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)"
+ "$([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)" &&
-make
+make &&
sed -e "s|${SRCDIR}/unix|/usr/lib|" \
-e "s|${SRCDIR}|/usr/include|" \
- -i tclConfig.sh
+ -i tclConfig.sh &&
sed -e "s|${SRCDIR}/unix/pkgs/tdbc1.1.2|/usr/lib/tdbc1.1.2|" \
-e "s|${SRCDIR}/pkgs/tdbc1.1.2/generic|/usr/include|" \
-e "s|${SRCDIR}/pkgs/tdbc1.1.2/library|/usr/lib/tcl8.6|" \
-e "s|${SRCDIR}/pkgs/tdbc1.1.2|/usr/include|" \
- -i pkgs/tdbc1.1.2/tdbcConfig.sh
+ -i pkgs/tdbc1.1.2/tdbcConfig.sh &&
sed -e "s|${SRCDIR}/unix/pkgs/itcl4.2.1|/usr/lib/itcl4.2.1|" \
-e "s|${SRCDIR}/pkgs/itcl4.2.1/generic|/usr/include|" \
-e "s|${SRCDIR}/pkgs/itcl4.2.1|/usr/include|" \
- -i pkgs/itcl4.2.1/itclConfig.sh
+ -i pkgs/itcl4.2.1/itclConfig.sh &&
unset SRCDIR
-make -j1 install
+make -j1 install &&
-chmod -v u+w /usr/lib/libtcl8.6.so
-make -j1 install-private-headers
-ln -sfv tclsh8.6 /usr/bin/tclsh
+chmod -v u+w /usr/lib/libtcl8.6.so &&
+make -j1 install-private-headers &&
+ln -sfv tclsh8.6 /usr/bin/tclsh &&
mv /usr/share/man/man3/{Thread,Tcl_Thread}.3