Consider application/xhtml+xml as HTML.

[bookmarks_db.git] / bkmk-set

diff --git a/bkmk-set b/bkmk-set
index 6dab5baa596ec3761f21aba06a3c633fdd3805dc..f64ea3c8a00fa568acf693cb27a675e422d4f46f 100755 (executable)
--- a/bkmk-set
+++ b/bkmk-set
@@ -1,30 +1,26 @@
 #! /bin/sh
 
 umask 077
+PATH=$HOME/lib/bookmarks_db:$PATH
 
-cd $HOME/work && \
-bkmk-koi -c || exit 1
-
-mv public-koi.tmp bkmk-koi.html && \
-mv public-win.tmp bkmk-win.html && \
-chmod a+r bkmk-koi.html bkmk-win.html bookmark.ht1 || exit 1
+STARTDIR="`pwd`"
+bkmk-koi -c && \
+mv public-koi.tmp bkmk-koi.html && chmod a+r bkmk-koi.html || exit 1
 
 echo "Splitting bookmarks..."
-cd $HOME/Internet/WWW/phd.pp.ru/Bookmarks && \
-rm -rf split.koi split.win || exit 1
+cd $HOME/Internet/WWW/htdocs/phd.pp.ru/Bookmarks && \
+rm -rf split || exit 1
 
-$HOME/lib/bookmarks_db/hotexplode.pl -o split.koi $HOME/work/bookmarks.html && \
-cp -p ../../nopasswd-index.html split.koi/privatelinks/index.html && \
-$HOME/lib/bookmarks_db/hotexplode.pl -o split.win $HOME/work/private-win.tmp && \
-cp -p ../../nopasswd-index.html split.win/privatelinks/index.html || exit 1
+$HOME/lib/bookmarks_db/hotexplode.pl -o split $STARTDIR/bookmarks.html && \
+cp -p ../../../misc/nopasswd-index.html split/privatelinks/index.html || exit 1
 
-cp -p $HOME/work/bkmk-koi.html $HOME/work/bkmk-win.html . && \
-chmod -R a+rX . || exit 1
+cp -p $STARTDIR/bkmk-koi.html bookmarks.html && chmod -R a+rX . || exit 1
 
 #/usr/local/htdig/bkmk.sh
 
-cd $HOME/work && \
-exec rm -f header bookmarks.err bookmarks_db.pickle bookmarks_db.flad private-win.tmp
+cd $STARTDIR && \
+exec rm -f header bookmarks.err bookmarks_db.pickle bookmarks_db.flad \
+   private-win.tmp public-win.tmp bookmarks.html bookmark.ht0 bookmark.ht1 bkmk-koi.html
 
 #zip -9 bkmk bkmk-koi.html bkmk-win.html && \
 #rm -f bkmk-win.html && \