X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/b6742c73921137d07c9e3f889faef131e711db7b..8919e050f688153441db6ac6195dfa6d6ededa8e:/bin/dot

diff --git a/bin/dot b/bin/dot
index 16e366e..0fd7dd7 100755
--- a/bin/dot
+++ b/bin/dot
@@ -10,23 +10,23 @@
 # dot setup
 #		install the necessary tools to $HOME/envs/dot
 #
-# dot list
-#   list available roles
+# dot link FILE
+#   updates ~/dot.HOSTNAME.yaml
+#   to include a symlink from ~/dotfiles/files/FILE to ~/.FILE
 #
 # dot check
-#   check setup vs expected
-#
-# dot add ROLE
-#   add ROLE to localhost
+#		check setup against ~/dot.HOSTNAME.yaml
 #
 # dot apply
-#		apply all added ROLES
+#		apply config in ~/dot.HOSTNAME.yaml
 
 # set -v
 
 ENVS="$HOME/envs"
 ANSIBLE="$ENVS/ansible/bin/ansible-playbook"
 TASKFILE="$HOME/dot.$HOSTNAME.yaml"
+LINKFILES="$HOME/dotfiles/files"
+INSTALLS="$HOME/dotfiles/install"
 
 read -d '' EMPTY_TASKFILE << EOF
 ---
@@ -36,8 +36,9 @@ read -d '' EMPTY_TASKFILE << EOF
   connection: local
 
   tasks:
-     - name: Do nothing
-       ansible.builtin.shell: echo "Nothing to do."
+    - name: Check on $TASKFILE
+      ansible.builtin.stat:
+        path: $TASKFILE
 EOF
 
 
@@ -60,40 +61,60 @@ if [ "$1" == "setup" ]; then
 	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
+	echo "$EMPTY_TASKFILE" > $TASKFILE
+	echo ""
+fi
+
+
 if [ "$1" == "check" ]; then
 	$ANSIBLE $TASKFILE --check --diff
 fi
 
-if [ "$1" == "list" ]; then
-  echo "May symlink:"
-	cd $HOME/dotfiles/files
-	ls -p | grep -v /
-fi
+if [ "$1" == "link" ]; then
+	if [ ! -n "$2" ]; then
+		echo "May symlink:"
+		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 [ "$1" == "link" ]; then
-	echo "wait"
+	echo "    $LINK_THIS_FILE" >> $TASKFILE
+	echo "$2 added to symlinks in $TASKFILE"
+	echo "Run 'dot apply' to create all configured symlinks"
 fi
 
-echo << EOF
-- name: Create a symbolic link
-  ansible.builtin.file:
-    src: /file/to/link/to
-    dest: /path/to/symlink
-    owner: foo
-    group: foo
-    state: link
-EOF
-
-echo "heh"
 
+if [ "$1" == "apply" ]; then
+  if [[ ! -f "$TASKFILE" ]]; then
+		echo "$TASKFILE is missing. Run 'dot setup'"
+		exit 1
+	fi
+	$ANSIBLE $TASKFILE
+fi
 
-if [ "$1" == "reset" ]; then
-	read -n1 -p "Reset $TASKFILE? [y,N]" input
-	if [[ ! $input == "Y" && ! $input == "y" ]]; then
-		echo "Aborted by user"
+if [ "$1" == "install" ]; then
+	if [ ! -n "$2" ]; then
+		echo "Can install:"
+		cd $INSTALLS
+		ls -p | grep -v /
 		exit 1
 	fi
-	echo "$EMPTY_TASKFILE" > $TASKFILE
+	$INSTALLS/$2
 fi
+
+