3 files changed, 40 insertions, 10 deletions
diff --git a/share/hoarder/grab-site/unix/linux/debian/install b/share/hoarder/grab-site/unix/linux/debian/install
index be9c074..a67961f 100755
--- a/share/hoarder/grab-site/unix/linux/debian/install
+++ b/share/hoarder/grab-site/unix/linux/debian/install
@@ -14,16 +14,17 @@ LIB="$2"
 # Requirements
 trashman_apt_install_packages git build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev libffi-dev libxml2-dev libxslt1-dev libre2-dev pkg-config
 
-# Setup pyenv and grab-site
-mkdir -p $HOME/.local/bin $HOME/.local/share
-cd $HOME/.local/bin
-wget https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer
-chmod +x pyenv-installer
-./pyenv-installer
-$HOME/.pyenv/bin/pyenv install 3.7.0
-$HOME/.pyenv/versions/3.7.0/bin/python -m venv $HOME/.local/share/gs-venv
-$HOME/.local/share/gs-venv/bin/pip install --process-dependency-links --no-binary --upgrade git+https://github.com/ludios/grab-site
+# Install pyenv
+hoarder install pyenv || exit 1
+
+# Install python and create venv
+mkdir -p $HOME/.local/share
+$HOME/.pyenv/bin/pyenv install 3.7.8 || exit 1
+$HOME/.pyenv/versions/3.7.8/bin/python -m venv $HOME/.local/share/grab-site-venv || exit 1
+
+# Install grab-site
+$HOME/.local/share/grab-site-venv/bin/pip install --no-binary lxml --upgrade git+https://github.com/ArchiveTeam/grab-site || exit 1
 
 echo "Add this to your ~/.bashrc or ~/.zshrc and then restart your shell (e.g. by opening a new terminal tab/window):"
 echo ""
-echo 'PATH="$PATH:'$HOME/.local/share/gs-venv/bin'"'
+echo 'PATH="$PATH:'$HOME/.local/share/grab-site-venv/bin'"'
diff --git a/share/hoarder/pyenv/info b/share/hoarder/pyenv/info
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/share/hoarder/pyenv/info
diff --git a/share/hoarder/pyenv/unix/install b/share/hoarder/pyenv/unix/install
new file mode 100755
index 0000000..b1b0579
--- /dev/null
+++ b/share/hoarder/pyenv/unix/install
@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+#
+# Install grab-site
+#
+
+# Parameters
+SHARE="$1"
+LIB="$2"
+
+# Include basic functions
+. $LIB/trashman/functions || exit 1
+. $LIB/trashman/debian    || exit 1
+
+# Requirements
+trashman_apt_install_packages git
+
+# Setup pyenv from installer script
+#mkdir -p $HOME/.local/bin $HOME/.local/share
+#cd $HOME/.local/bin
+#wget https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer
+#chmod +x pyenv-installer
+#./pyenv-installer
+
+# Setup pyenv by cloning it's repository
+if [ ! -d "$HOME/.pyenv" ]; then
+  git clone https://github.com/pyenv/pyenv.git $HOME/.pyenv
+else
+  ( cd $HOME/.pyenv && git pull )
+fi