From a4b0c819be3c18e4686166b63ed5a31283073303 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 14 Dec 2016 21:30:05 +0100 Subject: [PATCH] restructure project --- borg_interface | 4 ---- borg_interface.sh | 4 ++++ {bin => borg_interface/bin}/activate | 0 {bin => borg_interface/bin}/activate.csh | 0 {bin => borg_interface/bin}/activate.fish | 0 {bin => borg_interface/bin}/borg | Bin {bin => borg_interface/bin}/easy_install | 0 {bin => borg_interface/bin}/easy_install-3.4 | 0 {bin => borg_interface/bin}/pip | 0 {bin => borg_interface/bin}/pip3 | 0 {bin => borg_interface/bin}/pip3.4 | 0 {bin => borg_interface/bin}/python | 0 {bin => borg_interface/bin}/python3 | 0 {bin => borg_interface/bin}/python3.4 | 0 .../interface_functions.py | 2 -- .../interface_variables.py | 0 lib64 => borg_interface/lib64 | 0 borg_interface.py => borg_interface/main.py | 0 pyvenv.cfg => borg_interface/pyvenv.cfg | 0 19 files changed, 4 insertions(+), 6 deletions(-) delete mode 100755 borg_interface create mode 100755 borg_interface.sh rename {bin => borg_interface/bin}/activate (100%) rename {bin => borg_interface/bin}/activate.csh (100%) rename {bin => borg_interface/bin}/activate.fish (100%) rename {bin => borg_interface/bin}/borg (100%) rename {bin => borg_interface/bin}/easy_install (100%) rename {bin => borg_interface/bin}/easy_install-3.4 (100%) rename {bin => borg_interface/bin}/pip (100%) rename {bin => borg_interface/bin}/pip3 (100%) rename {bin => borg_interface/bin}/pip3.4 (100%) rename {bin => borg_interface/bin}/python (100%) rename {bin => borg_interface/bin}/python3 (100%) rename {bin => borg_interface/bin}/python3.4 (100%) rename interface_functions.py => borg_interface/interface_functions.py (97%) rename interface_variables.py => borg_interface/interface_variables.py (100%) rename lib64 => borg_interface/lib64 (100%) rename borg_interface.py => borg_interface/main.py (100%) rename pyvenv.cfg => borg_interface/pyvenv.cfg (100%) diff --git a/borg_interface b/borg_interface deleted file mode 100755 index 8eadb4d..0000000 --- a/borg_interface +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source bin/activate -python3 borg_interface.py -exit 0 diff --git a/borg_interface.sh b/borg_interface.sh new file mode 100755 index 0000000..5fe5997 --- /dev/null +++ b/borg_interface.sh @@ -0,0 +1,4 @@ +#!/bin/bash +source borg_interface/bin/activate +python3 borg_interface/main.py +exit 0 diff --git a/bin/activate b/borg_interface/bin/activate similarity index 100% rename from bin/activate rename to borg_interface/bin/activate diff --git a/bin/activate.csh b/borg_interface/bin/activate.csh similarity index 100% rename from bin/activate.csh rename to borg_interface/bin/activate.csh diff --git a/bin/activate.fish b/borg_interface/bin/activate.fish similarity index 100% rename from bin/activate.fish rename to borg_interface/bin/activate.fish diff --git a/bin/borg b/borg_interface/bin/borg similarity index 100% rename from bin/borg rename to borg_interface/bin/borg diff --git a/bin/easy_install b/borg_interface/bin/easy_install similarity index 100% rename from bin/easy_install rename to borg_interface/bin/easy_install diff --git a/bin/easy_install-3.4 b/borg_interface/bin/easy_install-3.4 similarity index 100% rename from bin/easy_install-3.4 rename to borg_interface/bin/easy_install-3.4 diff --git a/bin/pip b/borg_interface/bin/pip similarity index 100% rename from bin/pip rename to borg_interface/bin/pip diff --git a/bin/pip3 b/borg_interface/bin/pip3 similarity index 100% rename from bin/pip3 rename to borg_interface/bin/pip3 diff --git a/bin/pip3.4 b/borg_interface/bin/pip3.4 similarity index 100% rename from bin/pip3.4 rename to borg_interface/bin/pip3.4 diff --git a/bin/python b/borg_interface/bin/python similarity index 100% rename from bin/python rename to borg_interface/bin/python diff --git a/bin/python3 b/borg_interface/bin/python3 similarity index 100% rename from bin/python3 rename to borg_interface/bin/python3 diff --git a/bin/python3.4 b/borg_interface/bin/python3.4 similarity index 100% rename from bin/python3.4 rename to borg_interface/bin/python3.4 diff --git a/interface_functions.py b/borg_interface/interface_functions.py similarity index 97% rename from interface_functions.py rename to borg_interface/interface_functions.py index 764a8c6..15b1ceb 100644 --- a/interface_functions.py +++ b/borg_interface/interface_functions.py @@ -53,10 +53,8 @@ def configuration(): + config['DEFAULT']['server'] + ":" + config['DEFAULT']['repository_path']) - print("remote archive") else: repository = config['DEFAULT']['repository_path'] - print("local archive") input() # assign the password variable password = config['DEFAULT']['password'] diff --git a/interface_variables.py b/borg_interface/interface_variables.py similarity index 100% rename from interface_variables.py rename to borg_interface/interface_variables.py diff --git a/lib64 b/borg_interface/lib64 similarity index 100% rename from lib64 rename to borg_interface/lib64 diff --git a/borg_interface.py b/borg_interface/main.py similarity index 100% rename from borg_interface.py rename to borg_interface/main.py diff --git a/pyvenv.cfg b/borg_interface/pyvenv.cfg similarity index 100% rename from pyvenv.cfg rename to borg_interface/pyvenv.cfg