Add support for linking files with . already in the name

[dotfiles.git] / bin / dot

diff --git a/bin/dot b/bin/dot
index 0fd7dd78094f0f527a965d595f1f8dcc6c7b1f29..a08b732ddf7402cf0e7f177a6237a83f73366332 100755 (executable)
--- a/bin/dot
+++ b/bin/dot
@@ -1,32 +1,44 @@
 #!/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 link FILE
-#   updates ~/dot.HOSTNAME.yaml
-#   to include a symlink from ~/dotfiles/files/FILE to ~/.FILE
-#
-# dot check
-#              check setup against ~/dot.HOSTNAME.yaml
-#
-# dot apply
-#              apply config in ~/dot.HOSTNAME.yaml
+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
 
-ENVS="$HOME/envs"
-ANSIBLE="$ENVS/ansible/bin/ansible-playbook"
-TASKFILE="$HOME/dot.$HOSTNAME.yaml"
+TASKFILE="$HOME/backup/dot.$HOSTNAME.yaml"
 LINKFILES="$HOME/dotfiles/files"
 INSTALLS="$HOME/dotfiles/install"
+DOT="$HOME/.dot"
 
 read -d '' EMPTY_TASKFILE << EOF
 ---
@@ -41,6 +53,11 @@ read -d '' EMPTY_TASKFILE << EOF
         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 [[ ! -f "$ANSIBLE" ]]; then
@@ -52,10 +69,6 @@ if [ "$1" == "setup" ]; then
   if [[ -f "$ANSIBLE" ]]; then
                echo "[ ok ]: Ansible setup at $ANSIBLE"
        fi
-  if [[ ! -f "$TASKFILE" ]]; then
-               echo "Creating $TASKFILE"
-               echo "$EMPTY_TASKFILE" >> $TASKFILE
-       fi
   if [[ -f "$TASKFILE" ]]; then
                echo "[ ok ]: dot config at $TASKFILE"
        fi
@@ -78,7 +91,7 @@ fi
 
 if [ "$1" == "link" ]; then
        if [ ! -n "$2" ]; then
-               echo "May symlink:"
+               echo "Can symlink: (from $LINKFILES)"
                cd $LINKFILES
                ls -p | grep -v /
                exit 1
@@ -93,6 +106,20 @@ read -d '' LINK_THIS_FILE << EOF
         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"
@@ -109,12 +136,33 @@ fi
 
 if [ "$1" == "install" ]; then
        if [ ! -n "$2" ]; then
-               echo "Can install:"
+               echo "Can install: (.sh scripts in $INSTALLS)"
                cd $INSTALLS
-               ls -p | grep -v /
+               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
-       $INSTALLS/$2
-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