Add support for linking files with . already in the name

[dotfiles.git] / bin / dot

diff --git a/bin/dot b/bin/dot
index a59d80d3ff868e77b7fa16c8beabd8069f7c4480..a08b732ddf7402cf0e7f177a6237a83f73366332 100755 (executable)
--- a/bin/dot
+++ b/bin/dot
@@ -1,50 +1,168 @@
 #!/bin/bash
 #!/bin/bash

-# dot - a (mostly) one script dotfiles manager
-#
-# Copyright 2026 Edward Delaporte V
-# Licensed under AGPLv3 and later.
-#
-# Features
-#   symlinks - any file in $HOME/dotfiles/files may be symlinked
-#
-# dot setup
-#              install the necessary tools to $HOME/envs/dot
-#
-# dot list
-#   list available roles
-#
-# dot check
-#   check setup vs expected
-#
-# dot add ROLE
-#   add ROLE to localhost
-#
-# dot apply
-#              apply all added ROLES
+ENVS="$HOME/envs"
+ANSIBLE="$ENVS/ansible/bin/ansible-playbook"
+read -d '' HELP << EOF
+dot - a (mostly) one script dotfiles manager

 
 

+1. Install this file on your path
+2. Clone your (or my) 'dotfiles' repository to ~/dotfiles
+3. Run 'dot help' to get started.
+
+Copyright 2026 Edward Delaporte V
+Licensed under AGPLv3 and later.
+
+dot setup
+       install ansible CLI to $ANSIBLE
+
+dot link FILE
+  updates ~/dot.HOSTNAME.yaml
+  to include a symlink from ~/dotfiles/files/FILE to ~/.FILE
+
+dot install SCRIPT
+  updates ~/dot.HOSTNAME.yaml
+  to run ~/dotfiles/SCRIPT.sh if it has not yet been run
+  creates ~/dot/SCRIPT.installed after SCRIPT has been run
+
+dot check
+       check setup against ~/dot.HOSTNAME.yaml
+
+dot apply
+       apply config in ~/dot.HOSTNAME.yaml
+EOF
+
+if [ ! -n "$1" ] || [ "$1" == "help" ]; then
+       echo "$HELP"
+fi

 # set -v
 # set -v

-#
+
+TASKFILE="$HOME/backup/dot.$HOSTNAME.yaml"
+LINKFILES="$HOME/dotfiles/files"
+INSTALLS="$HOME/dotfiles/install"
+DOT="$HOME/.dot"
+
+read -d '' EMPTY_TASKFILE << EOF
+---
+- name: Set up dotfiles on $HOSTNAME
+  gather_facts: no
+  hosts: localhost
+  connection: local
+
+  tasks:
+    - name: Check on $TASKFILE
+      ansible.builtin.stat:
+        path: $TASKFILE
+EOF
+
+if [[ ! -f "$TASKFILE" ]]; then
+       echo "Creating empty $TASKFILE"
+       mkdir -p "$HOME/backup"
+       echo "$EMPTY_TASKFILE" >> $TASKFILE
+fi
+

 if [ "$1" == "setup" ]; then
 if [ "$1" == "setup" ]; then

-  if [[ ! -d $HOME/envs/ansible ]]; then
-               mkdir -p "$HOME/envs"
+  if [[ ! -f "$ANSIBLE" ]]; then
+               mkdir -p "$ENVS"

                echo "Setting up Ansible in ~/envs/ansible"
                cd $HOME/envs; python3 -m venv ansible
                echo "Setting up Ansible in ~/envs/ansible"
                cd $HOME/envs; python3 -m venv ansible

-               $HOME/envs/ansible/bin/pip install ansible
+               $HOME/envs/ansible/bin/pip install ansible jinja2
+       fi
+  if [[ -f "$ANSIBLE" ]]; then
+               echo "[ ok ]: Ansible setup at $ANSIBLE"

        fi
        fi

-  if [[ -d $HOME/envs/ansible ]]; then
-               echo "[ ok ]: ~/envs/ansible"
+  if [[ -f "$TASKFILE" ]]; then
+               echo "[ ok ]: dot config at $TASKFILE"
+       fi
+fi
+
+if [ "$1" == "reset" ]; then
+       read -n1 -p "Reset $TASKFILE? [y,N]" input
+       if [[ ! $input == "Y" && ! $input == "y" ]]; then
+               echo "Aborted by user"
+               exit 1

        fi
        fi

+       echo "$EMPTY_TASKFILE" > $TASKFILE
+       echo ""

 fi
 
 fi
 

+

 if [ "$1" == "check" ]; then
 if [ "$1" == "check" ]; then

-  echo "check"
+       $ANSIBLE $TASKFILE --check --diff

 fi
 
 fi
 

-if [ "$1" == "list" ]; then
-  echo "May symlink:"
-       cd $HOME/dotfiles/files
-       ls -p | grep -v /
+if [ "$1" == "link" ]; then
+       if [ ! -n "$2" ]; then
+               echo "Can symlink: (from $LINKFILES)"
+               cd $LINKFILES
+               ls -p | grep -v /
+               exit 1
+       fi
+
+read -d '' LINK_THIS_FILE << EOF
+
+    - name: symlink $2
+      ansible.builtin.file:
+        src: "$LINKFILES/$2"
+        dest: "$HOME/.$2"
+        state: "link"
+EOF

 
 

+if [[ "$2" == *"."* ]];then
+       # File already contains a dot
+read -d '' LINK_THIS_FILE << EOF
+
+    - name: symlink $2
+      ansible.builtin.file:
+        src: "$LINKFILES/$2"
+        dest: "$HOME/$2"
+        state: "link"
+EOF
+
+
+fi

 
 

+       echo "    $LINK_THIS_FILE" >> $TASKFILE
+       echo "$2 added to symlinks in $TASKFILE"
+       echo "Run 'dot apply' to create all configured symlinks"

 fi
 
 fi
 

+
+if [ "$1" == "apply" ]; then
+  if [[ ! -f "$TASKFILE" ]]; then
+               echo "$TASKFILE is missing. Run 'dot setup'"
+               exit 1
+       fi
+       $ANSIBLE $TASKFILE
+fi
+
+if [ "$1" == "install" ]; then
+       if [ ! -n "$2" ]; then
+               echo "Can install: (.sh scripts in $INSTALLS)"
+               cd $INSTALLS
+               ls -p | grep -v / | grep .sh
+               exit 1
+       fi
+  if [[ ! -f "$INSTALLS/$2.sh" ]]; then
+               echo "No such install script $INSTALLS/$2.sh"
+               echo "Run dot install with no params to list scripts."
+               exit 1
+       fi
+
+mkdir -p $DOT
+read -d '' RUN_INSTALL << EOF
+    - name: check $2
+      stat:
+        path: "$DOT/$2.installed"
+      register: $2_installed
+    - name: install $2
+      ansible.builtin.shell: |
+        "$INSTALLS/$2.sh"
+        touch "$DOT/$2.installed"
+      when: not $2_installed.stat.exists
+    - name: verify $2 is installed
+      ansible.builtin.debug:
+        msg: "$2 is installed."
+      when: $2_installed.stat.exists
+EOF
+       echo "    $RUN_INSTALL" >> $TASKFILE
+       echo "Run 'dot apply' to run the install"
+fi