From 651c566ae940bc46a78f6c8a115fc4ae858e608f Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Sun, 3 Sep 2023 13:55:53 -0400
Subject: [PATCH] fixing up bootstrappign scripts

---
 ...tmpl => run_once_01install-packages.sh.tmpl} | 17 +++++++++--------
 home/run_once_02install-rust.sh.tmpl            |  8 ++++++++
 home/run_once_03install-gwar.sh.tmpl            | 11 +++++++++++
 home/run_once_04install-helix.sh.tmpl           |  8 ++++++++
 4 files changed, 36 insertions(+), 8 deletions(-)
 rename home/{run_once_install-packages.sh.tmpl => run_once_01install-packages.sh.tmpl} (50%)
 create mode 100644 home/run_once_02install-rust.sh.tmpl
 create mode 100644 home/run_once_03install-gwar.sh.tmpl
 create mode 100644 home/run_once_04install-helix.sh.tmpl

diff --git a/home/run_once_install-packages.sh.tmpl b/home/run_once_01install-packages.sh.tmpl
similarity index 50%
rename from home/run_once_install-packages.sh.tmpl
rename to home/run_once_01install-packages.sh.tmpl
index 2571ab9..25847ff 100644
--- a/home/run_once_install-packages.sh.tmpl
+++ b/home/run_once_01install-packages.sh.tmpl
@@ -1,5 +1,8 @@
-{{ if eq .chezmoi.hostname "devterm" -}}
 #!/bin/sh
+
+set -e
+
+{{ if eq .chezmoi.hostname "devterm" -}}
 sudo apt install \
   brightnessctl \
   git \
@@ -12,8 +15,8 @@ sudo apt install \
   wget \
   zsh \
   -y
+
 {{ else if eq .chezmoi.hostname "rattusrattus" -}}
-#!/bin/sh
 sudo port install \
   colima \
   curl \
@@ -27,20 +30,18 @@ sudo port install \
   wget \
   zellij \
   zsh
+
 {{ else if eq .chezmoi.hostname "yersiniapestis" -}}
-#!/bin/sh
 sudo apt update
 sudo apt install \
+  build-essential \
   clang \
+  libssl-dev \
+  pkg-config \
   ripgrep \
   tmux \
   tree \
   wget \
   -y
 
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rustup.sh && chmod u+x /tmp/rustup.sh && /tmp/rustup.sh -y && rustup update stable
-git clone https://github.com/helix-editor/helix.git --branch 23.05 $HOME/.src/helix
-export PATH=$PATH:$HOME/.cargo/bin && cd $HOME/.src/helix && cargo install --path helix-term --locked && hx --grammar fetch && hx --grammar build
-
-# git clone ssh://git@pingo.thermokar.st/gwar $HOME/.src/gwar && cd $HOME/.src/gwar && cargo build --release && cp target/release/gwar ~/bin
 {{ end }}
diff --git a/home/run_once_02install-rust.sh.tmpl b/home/run_once_02install-rust.sh.tmpl
new file mode 100644
index 0000000..0bdbb2d
--- /dev/null
+++ b/home/run_once_02install-rust.sh.tmpl
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rustup.sh && \
+  chmod u+x /tmp/rustup.sh && \
+  /tmp/rustup.sh -y && \
+  rustup update stable
diff --git a/home/run_once_03install-gwar.sh.tmpl b/home/run_once_03install-gwar.sh.tmpl
new file mode 100644
index 0000000..7a663c2
--- /dev/null
+++ b/home/run_once_03install-gwar.sh.tmpl
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -d $HOME/.src/gwar ] ; then
+  git clone ssh://git@pingo.thermokar.st/gwar $HOME/.src/gwar
+fi
+
+cd $HOME/.src/gwar
+cargo build --release
+cp target/release/gwar ~/bin
diff --git a/home/run_once_04install-helix.sh.tmpl b/home/run_once_04install-helix.sh.tmpl
new file mode 100644
index 0000000..fb06d73
--- /dev/null
+++ b/home/run_once_04install-helix.sh.tmpl
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+git clone https://github.com/helix-editor/helix.git --branch 23.05 $HOME/.src/helix
+export PATH=$PATH:$HOME/.cargo/bin
+cd $HOME/.src/helix
+cargo install --path helix-term --locked
+hx --grammar fetch
+hx --grammar build