Check-in [a7c6a0dc4b]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:unsilence stuff and remove messages
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a7c6a0dc4bb25aa3f63c100232681d299e9a93dc
User & Date: brandon@invergo.net 2013-02-21 09:02:48
Context
2013-02-27
20:13
fix atom links check-in: 04a46df51a user: brandon@invergo.net tags: trunk
2013-02-21
09:02
unsilence stuff and remove messages check-in: a7c6a0dc4b user: brandon@invergo.net tags: trunk
09:01
fix missing parenthesis check-in: 99796fa669 user: brandon@invergo.net tags: trunk
Changes

Changes to Makefile.

    48     48   sp += # add space
    49     49   post-sort = $(shell echo -e $(subst $(sp),'\n',$2) | sort $1 --key=1,1 -)
    50     50   sorted_posts := $(addprefix $(POSTS)/,$(call post-sort,-r,$(notdir $(wildcard $(POSTS)/*.md.m4))))
    51     51   
    52     52   all: clean-index clean-atom index atom posts pages
    53     53   
    54     54   posts: $(raw_posts)
    55         -	@echo "==> building posts"
    56     55   
    57     56   pages: $(raw_pages)
    58         -	@echo "==> building pages"
    59     57   
    60     58   $(POSTS)/%.html: $(POSTS)/%.html.m4 $(MACROS) $(MAIN_T) $(POST_T)
    61         -	@m4 -P $(MACROS) $< $(POST_T) $(MAIN_T) > $@
           59  +	m4 -P $(MACROS) $< $(POST_T) $(MAIN_T) > $@
    62     60   
    63     61   $(SRC)/%.html: $(SRC)/%.html.m4 $(MACROS) $(MAIN_T) $(PAGE_T)
    64         -	@m4 -P $(MACROS) $< $(PAGE_T) $(MAIN_T) > $@
           62  +	m4 -P $(MACROS) $< $(PAGE_T) $(MAIN_T) > $@
    65     63   
    66     64   index: 
    67         -	@echo "==> building index"
    68         -	@echo "TITLE({\"News\"})" >> $(POSTS)/index.html.m4
    69         -	@echo "BODY({\"{\"" >> $(POSTS)/index.html.m4
    70         -	@for f in $(sorted_posts); do \
           65  +	echo "TITLE({\"News\"})" >> $(POSTS)/index.html.m4
           66  +	echo "BODY({\"{\"" >> $(POSTS)/index.html.m4
           67  +	for f in $(sorted_posts); do \
    71     68   		link="`basename $$f .md.m4`.html";\
    72     69   		head -n3 $$f | m4 -D "__URL"=$$link  \
    73     70   			-P $(MACROS) - $(BLOG_T) >> $(POSTS)/index.html.m4; \
    74     71   	done
    75         -	@echo "\"}\"})" >> $(POSTS)/index.html.m4
           72  +	echo "\"}\"})" >> $(POSTS)/index.html.m4
    76     73   
    77     74   atom:
    78         -	@echo "==> building feed"
    79         -	@m4 -P $(MACROS) $(ATOM_T) > $(SRC)/atom.xml
    80         -	@for f in $(sorted_posts); do \
           75  +	m4 -P $(MACROS) $(ATOM_T) > $(SRC)/atom.xml
           76  +	for f in $(sorted_posts); do \
    81     77   		link="`basename $$f .md.m4`.html";\
    82     78   		$(MARKDOWN) $$f | m4 -D "__URL"=$$link -P $(MACROS) - $(ATOM_E_T) \
    83     79   			| head -n -4 >> $(SRC)/atom.xml; \
    84     80   	done
    85         -	@echo "</feed>" >> $(SRC)/atom.xml
           81  +	echo "</feed>" >> $(SRC)/atom.xml
    86     82   
    87     83   
    88     84   $(SRC)/%.html.m4: $(SRC)/%.md.m4 
    89         -	@$(MARKDOWN) $< > $@
           85  +	$(MARKDOWN) $< > $@
    90     86   
    91     87   $(SRC)/%: $(SRC)/%.m4 $(MACROS)
    92         -	@m4 -P $(MACROS) $< > $@
           88  +	m4 -P $(MACROS) $< > $@
    93     89   
    94     90   $(DST)/%: $(SRC)/%
    95         -	@install -m 644 -D $< $@
           91  +	install -m 644 -D $< $@
    96     92   
    97     93   clean-index:
    98         -	@echo "==> cleaning index"
    99     94   	-rm $(POSTS)/index.html.m4
   100     95   
   101     96   clean-atom:
   102         -	@echo "==> cleaning feed"
   103     97   	-rm $(SRC)/atom.xml
   104     98   
   105     99   clean: clean-index clean-atom
   106         -	@echo "==> cleaning dst"
   107         -	@mv $(DST) .old_dst
   108         -	@rm -rf .old_dst
          100  +	mv $(DST) .old_dst
          101  +	rm -rf .old_dst
   109    102   
   110    103   new-post:
   111         -	@if [[ "$(TITLE)" == "" ]]; then echo "Error: no TITLE set"; fi
   112         -	@m4 -DTITLE="$(TITLE)" -P $(TEMPLATES)/new_post.md.m4 > \
          104  +	if [[ "$(TITLE)" == "" ]]; then echo "Error: no TITLE set"; fi
          105  +	m4 -DTITLE="$(TITLE)" -P $(TEMPLATES)/new_post.md.m4 > \
   113    106   		$(POSTS)/$(shell date +%Y-%m-%d)-$(subst $(sp),-,$(TITLE)).md.m4
   114    107   
   115    108   deploy:
   116         -	@$(RSYNC) -avze 'ssh -p $(SSH_PORT)' $(RSYNC_DELETE) $(DST)/ $(SSH_USER):$(DOC_ROOT)
          109  +	$(RSYNC) -avze 'ssh -p $(SSH_PORT)' $(RSYNC_DELETE) $(DST)/ $(SSH_USER):$(DOC_ROOT)
   117    110   
   118    111   .PHONY = all pages posts index clean-index clean new-post atom clean-atom deploy