From 6012091d2cbbc4cc017fac28ca3f2e141a9a7fd3 Mon Sep 17 00:00:00 2001
From: ktyl <me@ktyl.dev>
Date: Tue, 29 Mar 2022 22:52:38 +0100
Subject: [PATCH] update deploy strat

---
 deploy   |  8 --------
 makefile | 20 +++++++++++++++++---
 todo.md  |  1 +
 3 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100755 deploy

diff --git a/deploy b/deploy
deleted file mode 100755
index e7c7475..0000000
--- a/deploy
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-make run
-mv site ktyl.dev
-scp -r ktyl.dev admin@saturn:~
-rm -r ktyl.dev
-
-ssh saturn "sudo ./deploy"
diff --git a/makefile b/makefile
index dca2fae..7518586 100644
--- a/makefile
+++ b/makefile
@@ -1,3 +1,9 @@
+SITE_NAME 		= ktyl.dev
+# configured in ~/.ssh/config
+HOST			= pluto
+# a script on the remote server to move it on arrival
+REMOTE_SCRIPT	= ./deploy-$(SITE_NAME)
+
 SRC_DIR			= src
 IMG_DIR			= img
 OUT_DIR			= site
@@ -8,8 +14,6 @@ PAGES 			= $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.html")
 STYLES			= $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.css")
 
 IMAGES			= $(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.png")
-#IMAGES			= $(IMAGES:$(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.jpg"))
-#IMAGES			= $(IMAGES:$(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.gif"))
 
 HTML_INCLUDES 	= $(shell find $(SRC_DIR)/inc_html -name *.html)
 CSS_INCLUDES	= $(shell find $(SRC_DIR)/inc_css -name *.css)
@@ -18,7 +22,15 @@ HTML_TARGETS 	= $(PAGES:$(ROOT_DIR)/%.html=$(OUT_DIR)/%.html)
 CSS_TARGETS 	= $(STYLES:$(ROOT_DIR)/%.css=$(OUT_DIR)/%.css)
 PNG_TARGETS		= $(IMG_DIR)/%.png=$(OUT_DIR)/%.png
 
-run: $(HTML_TARGETS) $(CSS_TARGETS)
+deploy: site
+	cp -r $(OUT_DIR) $(SITE_NAME)
+	rsync -rP $(SITE_NAME) $(HOST):~
+	rm -r $(SITE_NAME)
+	ssh $(HOST) "sudo $(REMOTE_SCRIPT)"
+
+run: site
+
+site: $(HTML_TARGETS) $(CSS_TARGETS)
 	cp $(IMG_DIR)/*.png $(OUT_DIR)/
 
 $(OUT_DIR)/%.html: $(ROOT_DIR)/%.html $(HTML_INCLUDES)
@@ -31,3 +43,5 @@ $(OUT_DIR)/%.css: $(ROOT_DIR)/%.css $(CSS_INCLUDES)
 
 clean: 
 	rm -r $(OUT_DIR)
+
+.PHONY: site
diff --git a/todo.md b/todo.md
index e77e754..7d1dbca 100644
--- a/todo.md
+++ b/todo.md
@@ -1,3 +1,4 @@
+* [ ] transfer domain https://www.mythic-beasts.com/support/domains/transfer
 
 * [-] responsive design
     * [-] nav