From 3b26798171ecb6df88bdf2cf24cfb145650de3a3 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 21 May 2019 17:00:59 +0200 Subject: [PATCH] [enh] Pin the borg version to 1.1.10 --- scripts/_common.sh | 12 ++++++++++++ scripts/install | 9 +-------- scripts/restore | 10 +--------- scripts/upgrade | 8 +------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 21b70c5..3d5015f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,18 @@ PKG_DIR=$(cd ../; pwd) pkg_dependencies="python3-pip python3-dev libacl1-dev libssl-dev liblz4-dev python3-jinja2 python3-setuptools python-virtualenv" +# Install borg with pip if borg is not here +install_borg_with_pip () { + if [ ! -d /opt/borg-env ]; then + virtualenv --python=python3 /opt/borg-env + /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup=1.1.10 + echo "#!/bin/bash + /opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg + chmod u+x /usr/local/bin/borg + fi +} + + #================================================= # COMMON HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 14e4fd9..fd68558 100755 --- a/scripts/install +++ b/scripts/install @@ -33,14 +33,7 @@ ynh_save_args server ssh_user passphrase on_calendar conf data apps # INSTALL DEPENDENCIES #================================================= ynh_install_app_dependencies $pkg_dependencies - -if [ ! -d /opt/borg-env ]; then - virtualenv --python=python3 /opt/borg-env - /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup - echo "#!/bin/bash -/opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg - chmod u+x /usr/local/bin/borg -fi +install_borg_with_pip #================================================= # ACTIVATE BACKUP METHODS diff --git a/scripts/restore b/scripts/restore index 8ea1080..1a4cb76 100755 --- a/scripts/restore +++ b/scripts/restore @@ -34,15 +34,7 @@ ssh_user=$(ynh_app_setting_get $app ssh_user) # INSTALL DEPENDENCIES #================================================= ynh_install_app_dependencies $pkg_dependencies - -if [ ! -d /opt/borg-env ]; then - virtualenv --python=python3 /opt/borg-env - /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup - echo "#!/bin/bash -/opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg - chmod u+x /usr/local/bin/borg -fi - +install_borg_with_pip #================================================= # ACTIVATE BACKUP METHODS diff --git a/scripts/upgrade b/scripts/upgrade index 56513ec..612b8b9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,11 +44,5 @@ fi if is_stretch; then ynh_remove_backports - if [ ! -d /opt/borg-env ]; then - virtualenv --python=python3 /opt/borg-env - /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup - echo "#!/bin/bash -/opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg - chmod u+x /usr/local/bin/borg - fi + install_borg_with_pip fi