From 583f8c7c9d9dd5605ffdd2575031996fd9831585 Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Tue, 21 May 2019 17:05:24 +0200
Subject: [PATCH] [enh] Pin the borg version to 1.1.10

---
 scripts/_common.sh | 11 +++++++++++
 scripts/install    |  9 +--------
 scripts/restore    |  9 +--------
 scripts/upgrade    |  8 +-------
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8557b43..2d0cda9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,6 +8,17 @@ PKG_DIR=$(cd ../; pwd)
 
 pkg_dependencies="python3-pip python3-dev libacl1-dev libssl-dev liblz4-dev python-jinja2"
 
+# 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 d93e0bf..331f924 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,14 +33,7 @@ ynh_save_args ssh_user public_key quota
 # 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
 
 #=================================================
 # CREATE SSH USER USED BY BORG
diff --git a/scripts/restore b/scripts/restore
index 7046fb1..b83184d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,14 +35,7 @@ export quota=$(ynh_app_setting_get $app quota)
 # 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
 
 #=================================================
 # CREATE SSH USER USED BY BORG
diff --git a/scripts/upgrade b/scripts/upgrade
index 056774f..02caf8e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,11 +37,5 @@ ynh_abort_if_errors
 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