update deploy strat
fix typo remove text reorder makefile rules
This commit is contained in:
		
							parent
							
								
									55f5974bdb
								
							
						
					
					
						commit
						45997b1295
					
				
							
								
								
									
										8
									
								
								deploy
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								deploy
									
									
									
									
									
								
							| @ -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" |  | ||||||
							
								
								
									
										20
									
								
								makefile
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								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 | SRC_DIR			= src | ||||||
| IMG_DIR			= img | IMG_DIR			= img | ||||||
| OUT_DIR			= site | 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") | STYLES			= $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.css") | ||||||
| 
 | 
 | ||||||
| IMAGES			= $(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.png") | 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) | HTML_INCLUDES 	= $(shell find $(SRC_DIR)/inc_html -name *.html) | ||||||
| CSS_INCLUDES	= $(shell find $(SRC_DIR)/inc_css -name *.css) | CSS_INCLUDES	= $(shell find $(SRC_DIR)/inc_css -name *.css) | ||||||
| @ -18,9 +22,17 @@ HTML_TARGETS 	= $(PAGES:$(ROOT_DIR)/%.html=$(OUT_DIR)/%.html) | |||||||
| CSS_TARGETS 	= $(STYLES:$(ROOT_DIR)/%.css=$(OUT_DIR)/%.css) | CSS_TARGETS 	= $(STYLES:$(ROOT_DIR)/%.css=$(OUT_DIR)/%.css) | ||||||
| PNG_TARGETS		= $(IMG_DIR)/%.png=$(OUT_DIR)/%.png | PNG_TARGETS		= $(IMG_DIR)/%.png=$(OUT_DIR)/%.png | ||||||
| 
 | 
 | ||||||
| run: $(HTML_TARGETS) $(CSS_TARGETS) | site: $(HTML_TARGETS) $(CSS_TARGETS) | ||||||
| 	cp $(IMG_DIR)/*.png $(OUT_DIR)/ | 	cp $(IMG_DIR)/*.png $(OUT_DIR)/ | ||||||
| 
 | 
 | ||||||
|  | run: site | ||||||
|  | 
 | ||||||
|  | deploy: site | ||||||
|  | 	cp -r $(OUT_DIR) $(SITE_NAME) | ||||||
|  | 	rsync -rP $(SITE_NAME) $(HOST):~ | ||||||
|  | 	rm -r $(SITE_NAME) | ||||||
|  | 	ssh $(HOST) "sudo $(REMOTE_SCRIPT)" | ||||||
|  | 
 | ||||||
| $(OUT_DIR)/%.html: $(ROOT_DIR)/%.html $(HTML_INCLUDES) | $(OUT_DIR)/%.html: $(ROOT_DIR)/%.html $(HTML_INCLUDES) | ||||||
| 	mkdir -p $(OUT_DIR) | 	mkdir -p $(OUT_DIR) | ||||||
| 	python ppp/ppp.py $< $(HTML_INCLUDES) > $@ | 	python ppp/ppp.py $< $(HTML_INCLUDES) > $@ | ||||||
| @ -31,3 +43,5 @@ $(OUT_DIR)/%.css: $(ROOT_DIR)/%.css $(CSS_INCLUDES) | |||||||
| 
 | 
 | ||||||
| clean:  | clean:  | ||||||
| 	rm -r $(OUT_DIR) | 	rm -r $(OUT_DIR) | ||||||
|  | 
 | ||||||
|  | .PHONY: site | ||||||
|  | |||||||
| @ -27,7 +27,7 @@ by day i work with hardware, software and people finding useful things to do wit | |||||||
| --> | --> | ||||||
| 
 | 
 | ||||||
| By day I work with hardware, software and people finding useful things to do with immersive technology. | By day I work with hardware, software and people finding useful things to do with immersive technology. | ||||||
| For professional inquiries, please fine me on <a href="https://www.linkedin.com/in/cat-flynn-08751611b/">LinkedIn</a>. | For professional inquiries, please find me on <a href="https://www.linkedin.com/in/cat-flynn-08751611b/">LinkedIn</a>. | ||||||
| </p> | </p> | ||||||
| 
 | 
 | ||||||
| <div class="separator"></div> | <div class="separator"></div> | ||||||
|  | |||||||
| @ -95,7 +95,7 @@ | |||||||
| 
 | 
 | ||||||
| <div class="imgHolder"> | <div class="imgHolder"> | ||||||
| <img src="erf.png"></img> | <img src="erf.png"></img> | ||||||
| <a href="erf.png">earth</a> | <a href="erf.png"></a> | ||||||
| </div> | </div> | ||||||
| 
 | 
 | ||||||
| <div class="imgHolder"> | <div class="imgHolder"> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user