Remove public_html from paths

diff --git a/Makefile b/Makefile
index 5a50472edadf6ec17884144595ad8a946cca84d3..c3b36fc0d807e9ec89419e59f69f50732072ce84 100644 (file)
--- 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 dfa44315765bd8b01e47acadf129b634eaca2d79..6b70e307f25c5e01e525f8703d042e8351442826 100755 (executable)
--- 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 e07522455a2c898b1d47b5c8056b85ee0ae8e189..c945a6b915c85d6f56ef40d5ee27e7a8e1d60076 100755 (executable)
--- 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 e087fd5a642a02bef23b222672ad0c2d8be413d7..f8b44524ad828c33209285fcba9b4c18b430fa25 100755 (executable)
--- 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 f34437a9af1b647e5f3078f6978a0c14bd91ac67..19394839d9ebef92aca3173f3cdc708c34875f71 100644 (file)
--- 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 c6781299c89b61e3133be10e4cf5201decf50558..e51558db0a1c261c36018eecad4e3b1e63849263 100755 (executable)
--- 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 97b46995d288ba96f72ddfe0ded242ca10fea524..295f1ec7b4aa63a5202da018a42801d5a281efdd 100755 (executable)
--- 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