Remove absolute directory ~/lib to make it portable

diff --git a/bkmk-add b/bkmk-add
index 5e737e955023d4c99de28e394e60490d2ed20a80..01f403cfad85d187ea1a78a5f338decde93f55ab 100755 (executable)
--- a/bkmk-add
+++ b/bkmk-add
@@ -4,10 +4,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH=$HOME/lib/bookmarks_db:$PATH
+. "`dirname \"$0\"`"/set-path
 
 bkmk2db || exit 1
 

diff --git a/bkmk-chk b/bkmk-chk
index aca60b1753c943baae3194311365ccfed04c6785..3e5e5fe98789aecfcd8b7f59f06c8a5ce018dd23 100755 (executable)
--- a/bkmk-chk
+++ b/bkmk-chk
@@ -7,10 +7,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH="$HOME/lib/bookmarks_db:$PATH"
+. "`dirname \"$0\"`"/set-path
 
 ln -s "$HOME"/Desktop/bookmarks-*.json bookmarks_db.json &&
 BKMK_STORAGE=json convert_st.py pickle &&

diff --git a/bkmk-publish b/bkmk-publish
index c75048ad9433180034eb62d393c363fa9ab576c9..2f0b0d3a868fd052fe15620b1506bfa847379044 100755 (executable)
--- a/bkmk-publish
+++ b/bkmk-publish
@@ -4,11 +4,11 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
 umask 077
-PATH=$HOME/lib/bookmarks_db:$PATH
+. "`dirname \"$0\"`"/set-path
 
 STARTDIR="`pwd`"
 BKMK_FORMAT=NETSCAPE db2bkmk.py -p "Private links" -o bookmarks.html || exit 1

diff --git a/bkmk-rsync b/bkmk-rsync
index 5244ebb5b49ca7646c60bcc58965d4b377b3de39..0e73217378c00601fc7fb7045dfa8acf8c12e0a4 100755 (executable)
--- a/bkmk-rsync
+++ b/bkmk-rsync
@@ -4,10 +4,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH=$HOME/lib/bookmarks_db:$PATH
+. "`dirname \"$0\"`"/set-path
 umask 077
 
 bkmk2db || exit 1

diff --git a/bkmk-sort b/bkmk-sort
index debb35c5ce5a04a5236f027fe6e430a5bd575c33..c802f2209212885ea0f4772d0033a057bf55574c 100755 (executable)
--- a/bkmk-sort
+++ b/bkmk-sort
@@ -4,10 +4,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH=$HOME/lib/bookmarks_db:$PATH
+. "`dirname \"$0\"`"/set-path
 
 bkmk2db || exit 1
 

diff --git a/bkmk2db b/bkmk2db
index 514dd18380fe6e8e004ac383750cafad26d5e0ea..4eae2eb6244e2d3387d5be147e678b65e99a78c6 100755 (executable)
--- a/bkmk2db
+++ b/bkmk2db
@@ -4,10 +4,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH="$HOME/lib/bookmarks_db:$PATH"
+. "`dirname \"$0\"`"/set-path
 
 if [ ! -f ./bookmarks_db.pickle -a ! -f ./bookmarks_db.flad ]; then
    if [ -f ./bookmarks.html ]; then

diff --git a/doc/TODO b/doc/TODO
index 85c2de792399318b2e15a810cf793a2ee4e11a5e..5705e2139cc941f8b1d3a53ae3d0d15fd1c75120 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,5 +1,3 @@
-Remove absolute directory ~/lib to make it portable.
-
 Switch simple robot to urllib2.
 
 A new robot based on PycURL.

diff --git a/set-path b/set-path
new file mode 100644 (file)
index 0000000..43ff756
--- /dev/null
+++ b/set-path
@@ -0,0 +1,10 @@
+START_DIR="`pwd`"
+cd "`dirname \"$0\"`"
+CWD="`pwd`"
+cd "$START_DIR"
+if echo "$PATH" | grep -vq "\(^\|:\)$CWD\(:\|$\)"; then
+   PATH="$CWD:$PATH"
+fi
+START_DIR=''
+CWD=''
+unset START_DIR CWD

diff --git a/set-title-list b/set-title-list
index 0ce876adcc84c2520241ea9e08f7887c76d069f7..4bc22c4923b424d53530b7ba90d53d99f1fc2f81 100755 (executable)
--- a/set-title-list
+++ b/set-title-list
@@ -4,10 +4,10 @@
 # This file is a part of Bookmarks database and Internet robot.
 #
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 # __license__ = "GNU GPL"
 
-PATH="$HOME/lib/bookmarks_db:$PATH"
+. "`dirname \"$0\"`"/set-path
 
 set-title-list.py "$@" || exit 1