From 3c54c06a71c731f585b3780642d19c344ea8885d Mon Sep 17 00:00:00 2001 From: Thomas Ulmer Date: Mon, 12 Jan 2026 17:41:12 -0800 Subject: more confirms and emacs treesitter --- setup.sh | 60 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/setup.sh b/setup.sh index 7aa3086..665882d 100755 --- a/setup.sh +++ b/setup.sh @@ -10,23 +10,28 @@ fi git submodule update --init --recursive # handle files and symlinks -awk -f install.awk ensureddirs.csv symlinks.csv +if [[ "$(read -e -p 'Check and install symlinks? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then + awk -f install.awk ensureddirs.csv symlinks.csv +fi # build various tools -cd dwm -./setup.sh -cd .. - -cd st -./setup.sh -cd .. - -cd slstatus -./setup.sh -cd .. +if [[ "$(read -e -p 'Build dwm/st/slstatus? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then + cd dwm + ./setup.sh + cd .. + + cd st + ./setup.sh + cd .. + + cd slstatus + ./setup.sh + cd .. +fi EMACSFULL="--with-x-toolkit=gtk3 --disable-build-details --with-cairo \ - --with-harfbuzz --with-libsystemd=no --with-modules" + --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 \ @@ -35,19 +40,20 @@ EMACSMIN="--without-all \ EMACSALWAYS="--with-gnutls --with-file-notification=yes --with-native-compilation=yes --with-zlib=yes" -if [[ "$(read -e -p 'Build minimal emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then - EMACSOPT="${EMACSMIN} ${EMACSALWAYS}" -else - EMACSOPT="${EMACSFULL} ${EMACSALWAYS}" +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 + cd .. fi -cd emacs-source -./autogen.sh -./configure --prefix="${HOME}/.local" \ - ${EMACSOPT} \ - CFLAGS='-O2 -pipe' -make -make install -cd .. - -echo "All set up, remember to source ~/.bash_profile" +echo "All set up, remember to source ~/.bash_profile and symlink tmubrowse and tmuterm." -- cgit v1.2.3