From 93a2836154a84a90cdd0bbc1055a24fea4748c77 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Sat, 5 Apr 2025 16:37:09 -0400 Subject: [PATCH] Refactor code so coder_template_type is considered --- install.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index 3580c0c..e175508 100755 --- a/install.sh +++ b/install.sh @@ -11,13 +11,21 @@ git submodule init && git submodule update shopt -s nocasematch echo "Installing dotfiles..." -if [ -f /etc/os-release ]; then + +if [ "${CODER_TEMPLATE_TYPE}" == "Devcontainer" ]; then + installers/install-nix.sh + installers/install-nix-packages-flake.sh +elif [ "${CODER_OS_FAMILY:-}" == "Ubuntu" ]; then + echo "Detected OS as Ubuntu, using apt"; + sudo apt-get update; + sudo apt-get install -y stow; + installers/install-nix.sh +elif [ -f /etc/os-release ]; then echo "Idenitfying OS to install GNU stow..." - if [ "${CODER_OS_FAMILY:-}" == "Ubuntu" ] || grep -q -i debian /etc/os-release; then + if grep -q -i debian /etc/os-release; then echo "Detected OS as Ubuntu, using apt"; sudo apt-get update; sudo apt-get install -y stow; - installers/install-nix.sh elif grep -q -i rhel /etc/os-release || grep -q -i fedora /etc/os-release; then echo "You've got RedHat (or maybe Fedora)! Which is unsupported right now sorry!"; # sudo yum install -y stow; @@ -32,13 +40,10 @@ if [ -f /etc/os-release ]; then exit 1; fi; else - if [ "${CODER_TEMPLATE_TYPE}" == "Devcontainer" ]; then - installers/install-nix.sh - installers/install-nix-packages-flake.sh - fi echo "ERROR: Unable to find '/etc/os-release' information!" 1>&2; exit 1; fi + shopt -u nocasematch # Apply the dotfiles with stow