changing default install dir to ~/.local/pyroscope

Author: pyroscope

docs/advanced-monitoring.rst

@@ -56,8 +56,8 @@ need to be installed, which are not part of the core distribution.
 
    .. code-block:: shell
 
-      ~/lib/pyroscope/update-to-head.sh
-      ~/lib/pyroscope/bin/pip install -r ~/lib/pyroscope/requirements-torque.txt
+      ~/.local/pyroscope/update-to-head.sh
+      ~/.local/pyroscope/bin/pip install -r ~/.local/pyroscope/requirements-torque.txt
 
 #. Activate the web server option by adding this to your ``~/.pyroscope/torque.ini``:
 

docs/advanced-queue.rst

@@ -37,7 +37,7 @@ The following is how to install the *full* set of dependencies:
 
 .. code-block:: shell
 
-    ~/lib/pyroscope/bin/pip install -r ~/lib/pyroscope/requirements-torque.txt
+    ~/.local/pyroscope/bin/pip install -r ~/.local/pyroscope/requirements-torque.txt
 
 Watch out for any errors, since this installs several Python extensions that *might*
 need some ``*-dev`` OS packages available that you don't have on your machine.

docs/howto.rst

@@ -14,7 +14,7 @@ like in this example:
 .. code-block:: shell
 
     cd ~/rtorrent
-    ~/lib/pyroscope/src/scripts/add-categories.sh books hdtv movies
+    ~/.local/pyroscope/src/scripts/add-categories.sh books hdtv movies
 
 It is recommended to stick to alphanumeric category names,
 and use ``_`` for word separation.
@@ -31,7 +31,7 @@ you already have (and that also fit the *alphanumeric* constraint), call this:
 .. code-block:: shell
 
     cd ~/rtorrent
-    ~/lib/pyroscope/src/scripts/add-categories.sh \
+    ~/.local/pyroscope/src/scripts/add-categories.sh \
         $(rtcontrol custom_1=\! -qo custom_1 | egrep '^[_a-zA-Z0-9]+$' | sort -u)
 
 

docs/installation.rst

@@ -79,13 +79,13 @@ To do that, use the following commands:
 
 .. code-block:: shell
 
-    mkdir -p ~/bin ~/lib
-    git clone "https://github.com/pyroscope/pyrocore.git" ~/lib/pyroscope
+    mkdir -p ~/bin ~/.local
+    git clone "https://github.com/pyroscope/pyrocore.git" ~/.local/pyroscope
 
     # Pass "/usr/bin/python2", or whatever else fits, to the script as its
     # 1st argument, if the default of "/usr/bin/python" is not a suitable
     # version.
-    ~/lib/pyroscope/update-to-head.sh
+    ~/.local/pyroscope/update-to-head.sh
 
     # Check success
     pyroadmin --version  # call "exec $SHELL -l" if this fails, and retry

docs/overview.rst

@@ -55,7 +55,7 @@ XMLRPC
     .. code-block:: bash
 
         $ ldd $(command which rtorrent) | grep libxmlrpc.so
-                libxmlrpc.so.3 => /home/pyroscope/lib/rtorrent-0.9.6/lib/libxmlrpc.so.3 …
+                libxmlrpc.so.3 => /home/pyroscope/.local/rtorrent/0.9.6-PS-1.0/lib/libxmlrpc.so.3 …
 
 
 Quick Start Guide

docs/updating.rst

@@ -27,7 +27,7 @@ These steps should make a copy of pretty much anything important:
     .. code-block:: bash
 
         tar cvfz /tmp/pyroscope-backup-$USER-$(date +'%Y-%m-%d').tgz \
-            ~/.pyroscope/ ~/lib/pyroscope/
+            ~/.pyroscope/ ~/.local/pyroscope/
 
  #. Depending on how you install rTorrent, make a copy of the rTorrent
     executable. Note that the ``rTorrent-PS`` build script installs into
@@ -80,7 +80,7 @@ Then to **update** an existing installation, use these commands:
 
 .. code-block:: bash
 
-    cd ~/lib/pyroscope
+    cd ~/.local/pyroscope
     ./update-to-head.sh
 
 
@@ -123,7 +123,7 @@ these commands (assuming the standard installation paths):
 
 .. code-block:: bash
 
-    cd ~/lib/pyroscope
+    cd ~/.local/pyroscope
     source bin/activate
     svn update
     git clone git://github.com/pyroscope/pyrobase.git pyrobase

src/scripts/make-rtorrent-config.sh

@@ -4,12 +4,16 @@
 #
 
 export RT_HOME="${RT_HOME:-$HOME/rtorrent}"
+
+INSTALL_ROOT="$(command cd $(dirname "$0") >/dev/null && pwd)"
+INSTALL_ROOT="$(dirname $(dirname "$INSTALL_ROOT"))"
+
 mkdir -p "$RT_HOME"
 command cd "$RT_HOME"
 
 # Create "rtorrent.rc"
 echo "*** Creating 'rtorrent.rc' in '$RT_HOME'..."
-sed -e "s:RT_HOME:$RT_HOME:" <~/lib/pyroscope/docs/examples/rtorrent.rc >$RT_HOME/rtorrent.rc
+sed -e "s:RT_HOME:$RT_HOME:" <"$INSTALL_ROOT/docs/examples/rtorrent.rc" >"$RT_HOME/rtorrent.rc"
 
 # Download pimp-my-box source
 echo "*** Downloading 'rtorrent.d' snippets..."