refactor(#39): update meatbox scripts to be fully posix compliant

.circleci/config.yml

@@ -32,7 +32,7 @@ jobs:
           name: "Build Dockerfile"
           command: |
             apk add --no-cache git >/dev/null 2>&1
-            cd scripts/linux/alpine
+            cd ./scripts/alpine
             GIT_COMMIT_SHA1=$CIRCLE_SHA1 ./build.sh
           no_output_timeout: 30m
 
@@ -46,7 +46,7 @@ jobs:
           name: "Build Dockerfile"
           command: |
             apk add --no-cache git >/dev/null 2>&1
-            cd scripts/linux/arch
+            cd ./scripts/arch
             GIT_COMMIT_SHA1=$CIRCLE_SHA1 ./build.sh
           no_output_timeout: 30m
 

bin/meatbox

@@ -25,63 +25,53 @@ log_message() {
 }
 
 meatbox_run_script() {
-  directory="$1"
-  script="$2"
+  ctx="$1"
+  cmd="$2"
 
-  (cd "$MEATBOX_SCRIPTS_DIR/$directory" && "./$script")
-}
-
-meatbox_run_universal_script() {
-  script="$1"
-
-  meatbox_run_script "universal" "$script"
-}
-
-meatbox_run_os_script() {
-  script="$1"
-  os="$(uname -s | lowercase)"
-
-  if [ -f "$MEATBOX_SCRIPTS_DIR/$os/$script" ]; then
-    meatbox_run_script "$os" "$script"
+  if [ -f "$MEATBOX_SCRIPTS_DIR/$ctx/$cmd.sh" ]; then
+    (cd "$MEATBOX_SCRIPTS_DIR/$ctx" && "./$cmd.sh")
   fi
 }
 
-meatbox_help() {
-  usage
-}
+meatbox_run() {
+  meatbox_run_script "$kernel" "$cmd"
+
+  if [ "$kernel" = "linux" ]; then
+    distro=""
 
-meatbox_bootstrap() {
-  start-sudo-loop "$MEATBOX_PASSWORD"
+  # cat /etc/*release
 
-  meatbox_run_os_script "bootstrap.sh"
-  meatbox_run_universal_script "bootstrap.sh"
-}
+  # ID=alpine
+  # NAME="Alpine Linux"
 
-if [ "$1" = "bootstrap" ]; then
-  meatbox_bootstrap
+  # ID=antergos
+  # ID_LIKE=archlinux
+  # NAME="Antergos Linux"
+  # PRETTY_NAME="Antergos Linux"
 
-  exit 0
-fi
+  # DISTRIB_ID=Arch
+  # NAME="ArchBang Linux"
+  # ID=arch
+  # PRETTY_NAME="ArchBang Linux"
 
-meatbox_setup() {
-  start-sudo-loop "$MEATBOX_PASSWORD"
+    meatbox_run_script "$distro" "$cmd"
+  fi
 
-  meatbox_run_os_script "setup.sh"
-  meatbox_run_universal_script "setup.sh"
+  meatbox_run_script "agnostic" "$cmd"
 }
 
-meatbox_update() {
-  start-sudo-loop "$MEATBOX_PASSWORD"
-
-  meatbox_run_os_script "update.sh"
-  meatbox_run_universal_script "update.sh"
+meatbox_help() {
+  usage
 }
 
 meatbox() {
   cmd="$1"
 
   case "$cmd" in
-    bootstrap|setup|update) "meatbox_$cmd" ;;
+    bootstrap|setup|update)
+      start-sudo-loop "$MEATBOX_PASSWORD"
+      meatbox_run "$cmd"      
+      ;;
     *) meatbox_help ;;
   esac
 }

bin/pacfast

@@ -43,7 +43,7 @@ download_packages() {
     --dir="$cache_dir"
 
   rm "$dl_list_file"
-}   
+}
 
 # if we have unfinished jobs from a previous run, complete them
 if [ -f "$dl_list_file" ]; then

bin/start-sudo-loop

@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -eo pipefail
+set -e
 
 start_sudo_loop() {
-  local password="$1"
+  password="$1"
 
   if [ -n "$password" ]; then
     echo "$password" | sudo -Sv

scripts/agnostic/install_or_update_python_packages.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
 pip install --user --upgrade \
   pip \

scripts/agnostic/install_or_update_zplugin.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/meatwallace/zplugin/master/doc/install.sh)"

scripts/agnostic/load_zsh.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
 # fire up zsh to trigger zplugin initialization
 zsh

scripts/agnostic/update.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-declare scripts="
+scripts="
   install_or_update_asdf.sh
   install_or_update_node_modules.sh
   install_or_update_python_packages.sh

scripts/alpine/Dockerfile

@@ -11,9 +11,10 @@ ARG MEATBOX_PASSWORD
 ARG MEATBOX_SETUP_SUDOERS_FILE="20-meatbox-setup"
 
 RUN \
-  # add our user account, ensuring it's in the `wheel` group for `sudo`
+  # install the bare minimum dependencies for this setup & our dots to work
+  apk add --no-cache bash curl git sudo && \
+  # add our user account & set the password
   adduser -D -s /bin/sh "${MEATBOX_USER}" users && \
-  # set the account's password
   echo "${MEATBOX_USER}:${MEATBOX_PASSWORD}" | chpasswd && \ 
   # add a sudo config file that allows our user to use `sudo`
   echo "${MEATBOX_USER} ALL=(ALL) ALL" >> "/etc/sudoers.d/${USER_SUDOERS_FILE}" && \
@@ -22,10 +23,8 @@ RUN \
   # add a temporary sudo config file allowing our user to use pacman & make without
   # a password so our setup script doesn't require a custom `askpass` just for
   # docker
-  echo "${MEATBOX_USER} ALL=NOPASSWD: /bin/sh, /bin/ln, /sbin/apk, /usr/sbin/addgroup, /sbin/rc-update, /sbin/rc-service" >> "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}" && \
-  chmod 0440 "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}" && \
-  apk update && \
-  apk add --no-cache curl
+  echo "${MEATBOX_USER} ALL=NOPASSWD: ALL" >> "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}" && \
+  chmod 0440 "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}"
 
 # swap into our user account
 USER "${MEATBOX_USER}"
@@ -35,7 +34,10 @@ WORKDIR "/home/${MEATBOX_USER}"
 ARG MEATBOX_CHECKOUT_SHA1
 
 RUN \
-      curl https://meatbox.one | sh && \
-      meatbox bootstrap && \
-      meatbox setup && \
-      rm -rf tmp/* /var/cache/apk/*
+  # run our system setup script from our staging alias
+  curl "https://meatbox.meatwallace.now.sh" | MEATBOX_CHECKOUT_SHA1="${MEATBOX_CHECKOUT_SHA1}" sh && \
+  . "/home/${MEATBOX_USER}/.bash_profile" && \
+  meatbox bootstrap && \
+  . "/home/${MEATBOX_USER}/.bash_profile" && \
+  meatbox setup && \
+  rm -rf tmp/* /var/cache/apk/*

scripts/alpine/add_edge_repositories.sh

@@ -2,6 +2,6 @@
 
 set -eu
 
-sudo echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
-sudo echo "@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
-sudo echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" | sudo tee -a /etc/apk/repositories
+echo "@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community" | sudo tee -a /etc/apk/repositories
+echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" | sudo tee -a /etc/apk/repositories

scripts/alpine/enable_services.sh

@@ -2,8 +2,6 @@
 
 set -eu
 
-username="$(id -u -n)"
-
 # lightdm
 # libvirtd
 # virtlogd

scripts/alpine/install_or_update_packages.sh

@@ -4,4 +4,5 @@ set -eu
 
 packages="$(grep -v '^\#' ./APKFile | grep .)"
 
+# shellcheck disable=SC2086
 apk add --no-cache $packages

scripts/alpine/install_pciutils.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+if [ ! -x "$(command -v lspci)" ]; then
+  apk add --no-cache pciutils
+fi

scripts/arch/Dockerfile

@@ -24,7 +24,7 @@ RUN \
   # add a temporary sudo config file allowing our user to use pacman & make without
   # a password so our setup script doesn't require a custom `askpass` just for
   # docker
-  echo "${MEATBOX_USER} ALL=NOPASSWD: /usr/bin/bash, /usr/bin/ln, /usr/bin/make, /usr/bin/nvidia-xconfig, /usr/bin/pacman, /usr/bin/pacman-key, /usr/bin/systemctl, /usr/bin/usermod, /home/${MEATBOX_USER}/bin/pacfast" >> "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}" && \
+  echo "${MEATBOX_USER} ALL=NOPASSWD: /usr/bin/sh, /usr/bin/bash, /usr/bin/ln, /usr/bin/make, /usr/bin/nvidia-xconfig, /usr/bin/pacman, /usr/bin/pacman-key, /usr/bin/systemctl, /usr/bin/usermod, /home/${MEATBOX_USER}/bin/pacfast" >> "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}" && \
   chmod 0440 "/etc/sudoers.d/${MEATBOX_SETUP_SUDOERS_FILE}"
 
 # swap into our user account

scripts/arch/add_pacman_repo_keys.sh

@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+set -eu
 
 # andontie-aur
 sudo pacman-key --recv-key EA50C866329648EE >/dev/null

scripts/arch/install_pciutils.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
 if [ ! -x "$(command -v lspci)" ]; then
   yay -S --noconfirm "pciutils" >/dev/null

scripts/arch/install_yay.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
 # install `yay` if it's unavalable, a `pacman` wrapper that integrates the AUR
 if [ ! -x "$(command -v yay)" ]; then

scripts/arch/update_package_configuration.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu

scripts/arch/update_system_packages.sh

@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+set -eu
 
 # upgrade our system packages
 yay -Su --noconfirm >/dev/null

scripts/linux/install_or_update_x11docker.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -eo pipefail
+set -e 
 
 curl -fsSl https://raw.githubusercontent.com/mviereck/x11docker/master/x11docker | sudo bash -s -- --update >/dev/null