From: Oleg Broytman <phd@phdru.name>
Date: Sun, 17 Nov 2013 00:32:13 +0000 (+0400)
Subject: Remove public_html from paths
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=88bb9d0069ca4d56226df0beb222646ca72b984f;p=phdru.name%2Fphdru.name.git

Remove public_html from paths
---

diff --git a/Makefile b/Makefile
index 5a50472..c3b36fc 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ blog: phd_site.py atom_10.py rss_20.py
 	$(MAKE) html
 
 
-templates = $(shell find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print)
+templates = $(shell find ../htdocs/phdru.name -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
@@ -40,4 +40,4 @@ html: phd_site.py $(htmls)
 
 .PHONY: news
 news: atom_10.py rss_20.py
-	(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name/public_html && ./make-news.py ru ../htdocs/phdru.name/public_html/Russian)
+	(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name && ./make-news.py ru ../htdocs/phdru.name/Russian)
diff --git a/make-all b/make-all
index dfa4431..6b70e30 100755
--- a/make-all
+++ b/make-all
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print0 |
+find ../htdocs/phdru.name -type f -name \*.tmpl -print0 |
    xargs -r0 ./make-files
diff --git a/make-changed b/make-changed
index e075224..c945a6b 100755
--- a/make-changed
+++ b/make-changed
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print |
+find ../htdocs/phdru.name -type f -name \*.tmpl -print |
    ./make-changed.py | xargs -r ./make-files
diff --git a/make-new b/make-new
index e087fd5..f8b4452 100755
--- a/make-new
+++ b/make-new
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -mtime -1 -print0 |
+find ../htdocs/phdru.name -type f -name \*.tmpl -mtime -1 -print0 |
    xargs -r0 ./make-files
diff --git a/phd.py b/phd.py
index f34437a..1939483 100644
--- a/phd.py
+++ b/phd.py
@@ -9,7 +9,7 @@ def _url2href(match):
    return '<a href="%s">%s</a>' % (url, url)
 
 
-full_dirs = len(os.getcwd().split('/')) + 2
+full_dirs = len(os.getcwd().split('/')) + 1
 
 class phd(Template):
    def __init__(self, *args, **kw):
diff --git a/reindex_blog_ru b/reindex_blog_ru
index c678129..e51558d 100755
--- a/reindex_blog_ru
+++ b/reindex_blog_ru
@@ -5,5 +5,5 @@ umask 022
 LC_TIME=ru_RU.KOI8-R
 export LC_TIME
 
-cd ../htdocs/phdru.name/public_html &&
-exec ../../../phdru.name/reindex_blog.py ../../../phdru.name/ru Russian/blog
+cd ../htdocs/phdru.name &&
+exec ../../phdru.name/reindex_blog.py ../../phdru.name/ru Russian/blog
diff --git a/update-all b/update-all
index 97b4699..295f1ec 100755
--- a/update-all
+++ b/update-all
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-cd ../htdocs/phdru.name &&
-exec distribute -d public_html
+cd ../htdocs &&
+exec distribute -d phdru.name