1 files changed, 34 insertions, 28 deletions
diff --git a/setup.sh b/setup.sh
index 665882d..2912a27 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,17 +9,38 @@ fi
 
 git submodule update --init --recursive
 
-# handle files and symlinks
-if [[ "$(read -e -p 'Check and install symlinks? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
+confirm () {
+    [[ "$(read -e -p "$1 [y/N]> "; echo $REPLY)" == [Yy]* ]]
+}
+
+if confirm "Check and install symlinks?"; then
     awk -f install.awk ensureddirs.csv symlinks.csv
 fi
 
-# build various tools
-if [[ "$(read -e -p 'Build dwm/st/slstatus? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
+cd tree/src
+
+if confirm "Build and use tcc?"; then
+    cd tcc
+    ./setup.sh
+    cd ..
+    export CC=${HOME}/.local/bin/tcc
+fi
+
+if confirm "Build micro haskell?"; then
+    cd microhs
+    ./setup.sh
+    cd ..
+fi
+
+if confirm "Build dwm/st/slstatus/dmenu/unclutter?"; then
     cd dwm
     ./setup.sh
     cd ..
 
+    cd dmenu
+    ./setup.sh
+    cd ..
+
     cd st
     ./setup.sh
     cd ..
@@ -29,30 +50,15 @@ if [[ "$(read -e -p 'Build dwm/st/slstatus? [y/N]> '; echo $REPLY)" == [Yy]* ]];
     cd ..
 fi
 
-EMACSFULL="--with-x-toolkit=gtk3 --disable-build-details --with-cairo \
-           --with-harfbuzz --with-libsystemd=no --with-modules \
-           --with-tree-sitter"
-
-EMACSMIN="--without-all \
-          --with-x-toolkit=no  --without-xwidgets --without-x --without-ns --disable-ns-self-contained \
-          --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no \
-          --without-internationalization --without-tree-sitter --without-mailutils"
-
-EMACSALWAYS="--with-gnutls --with-file-notification=yes --with-native-compilation=yes --with-zlib=yes"
-
-if [[ "$(read -e -p 'Build emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
-    if [[ "$(read -e -p 'Build minimal emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
-        EMACSOPT="${EMACSMIN}  ${EMACSALWAYS}"
-    else
-        EMACSOPT="${EMACSFULL} ${EMACSALWAYS}"
-    fi
-    cd emacs-source
-    ./autogen.sh
-    ./configure --prefix="${HOME}/.local" \
-                ${EMACSOPT} \
-                CFLAGS='-O2 -pipe'
-    make
-    make install
+if confirm "Build non-local tools (caps2esc) for openrc?"; then
+    cd capslock
+    ./setup.sh
+    cd ..
+fi
+
+if confirm "Build Emacs?"; then
+    cd emacs
+    ./setup.sh
     cd ..
 fi