diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | archlinux/Makefile | 18 | ||||
| -rw-r--r-- | archlinux/PKGBUILD | 37 | ||||
| -rw-r--r-- | src/Makefile | 13 | ||||
| -rw-r--r-- | src/setup.py | 4 |
6 files changed, 12 insertions, 76 deletions
@@ -1,3 +1 @@ **/__pycache__ -backups -fakeroot @@ -1,17 +1,13 @@ -# vim: shiftwidth=4 tabstop=4 noexpandtab +# vim: shiftwidth=4 softtabstop=4 tabstop=4 noexpandtab + DESTDIR="" # leave empty for the current system or provide a fakeroot here PREFIX="/usr" -.PHONY: all clean install -all: - make -C src all +.PHONY: install -clean: - make -C src clean - find . -type d -iname '__pycache__' -exec rm -rf {} +; -install: all +install: + install -Dm 644 config/default.json $(DESTDIR)/etc/xbackup/config.json make -C src install DESTDIR=$(abspath $(DESTDIR)) - diff --git a/archlinux/Makefile b/archlinux/Makefile deleted file mode 100644 index 9809294..0000000 --- a/archlinux/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# vim: shiftwidth=4 tabstop=4 noexpandtab -.PHONY: all clean install uninstall - -SOFTWARE_NAME="xbackup" - -all: - tar --exclude-vcs --exclude ${SOFTWARE_NAME}/archlinux -czvf ${SOFTWARE_NAME}.tar.gz ../../${SOFTWARE_NAME} - makepkg -cf - -clean: - rm -rf $(SOFTWARE_NAME).tar.gz - rm -rf $(SOFTWARE_NAME)*.pkg.tar.* - -install: all - sudo pacman -U $(SOFTWARE_NAME)*.pkg.tar.* - -uninstall: - sudo pacman -R $(SOFTWARE_NAME) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD deleted file mode 100644 index 923e25d..0000000 --- a/archlinux/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ - -# Maintainer: xengineering <me@xengineering.eu> -pkgname=xbackup -pkgver=0.0.1 -pkgrel=1 -epoch= -pkgdesc='Convenience wrapper around the Borg backup tool' -arch=('any') -url='https://xengineering.eu' -license=('GPL3') -groups=() -depends=('licenses' 'python' 'borg') -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=('etc/xbackup/config.json') -options=() -install= -changelog= -source=("${pkgname}.tar.gz") -noextract=() -md5sums=('SKIP') -validpgpkeys=() - -build() { - #./configure --prefix=/usr - cd ${pkgname} - make all -} - -package() { - cd ${pkgname} - make DESTDIR="${pkgdir}" install -} diff --git a/src/Makefile b/src/Makefile index c3a3660..a720671 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,14 +1,11 @@ -# vim: shiftwidth=4 tabstop=4 noexpandtab +# vim: shiftwidth=4 softtabstop=4 tabstop=4 noexpandtab + DESTDIR="" # leave empty for the current system or provide a fakeroot here -.PHONY: all clean install -all: - python setup.py build +.PHONY: install -clean: - rm -rf build -install: all - python setup.py install --root=$(DESTDIR) --optimize=1 --skip-build +install: + python3 setup.py install --root=$(DESTDIR) --optimize=1 --skip-build diff --git a/src/setup.py b/src/setup.py index 4279fe8..e73eef0 100644 --- a/src/setup.py +++ b/src/setup.py @@ -1,12 +1,12 @@ #!/usr/bin/python3 -# vim: shiftwidth=4 tabstop=4 expandtab +# vim: shiftwidth=4 softtabstop=4 tabstop=4 expandtab from distutils.core import setup setup(name="xbackup", - version="0.0.1", + version="0.1.0", description="Convenience wrapper around the Borg backup tool", author="xengineering", author_email="me@xengineering.eu", |