From 266df4cdc586f1476fe6e8aaffdf9bbafbda6f71 Mon Sep 17 00:00:00 2001 From: deadc0de Date: Fri, 9 Feb 2018 11:11:23 +0100 Subject: [PATCH 01/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 23a06f759..e41538420 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Features: * Easy import dotfiles * Handle files and directories * Associate an action to the deployment of specific dotfiles +* Associate transformations that allow to store encrypted dotfiles Check the [blog post](https://deadc0de.re/articles/dotfiles.html) and and the [example](#example) for more. From 8830777bf7266396ad7e020179eea948cdd3ed3c Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sat, 10 Feb 2018 17:45:36 +0100 Subject: [PATCH 02/12] update aur package --- packages/arch/PKGBUILD | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/arch/PKGBUILD b/packages/arch/PKGBUILD index 87281d7dc..ad427cf9c 100644 --- a/packages/arch/PKGBUILD +++ b/packages/arch/PKGBUILD @@ -12,11 +12,6 @@ depends=('python' 'python-jinja' 'python-docopt' 'python-pyaml') source=("git+https://github.com/deadc0de6/dotdrop.git") md5sums=('SKIP') -pkgver() { - cd "$pkgname" - git tag -l | tail -1 | sed 's/^v//g' -} - package() { cd "${pkgname}" python setup.py install --root="${pkgdir}/" From bde20cb63d3634fcd7fa43639c18cca69682f609 Mon Sep 17 00:00:00 2001 From: deadc0de Date: Sat, 10 Feb 2018 17:56:28 +0100 Subject: [PATCH 03/12] adding aur badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e41538420..1e992dcdd 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0) [![Coverage Status](https://coveralls.io/repos/github/deadc0de6/dotdrop/badge.svg?branch=master)](https://coveralls.io/github/deadc0de6/dotdrop?branch=master) [![PyPI version](https://badge.fury.io/py/dotdrop.svg)](https://badge.fury.io/py/dotdrop) +[![AUR](https://img.shields.io/aur/version/dotdrop.svg)](https://aur.archlinux.org/packages/dotdrop) [![Python](https://img.shields.io/pypi/pyversions/dotdrop.svg)](https://pypi.python.org/pypi/dotdrop) *Save your dotfiles once, deploy them everywhere* From 078deb99f57e749146f3bbfd17756a114ce2ff4a Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 11:54:50 +0100 Subject: [PATCH 04/12] update aur packages --- packages/arch-dotdrop-git/PKGBUILD | 27 ++++++++++++++++++++++++ packages/{arch => arch-dotdrop}/PKGBUILD | 14 ++++++++---- packages/arch/.SRCINFO | 16 -------------- 3 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 packages/arch-dotdrop-git/PKGBUILD rename packages/{arch => arch-dotdrop}/PKGBUILD (55%) delete mode 100644 packages/arch/.SRCINFO diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD new file mode 100644 index 000000000..54d0c4136 --- /dev/null +++ b/packages/arch-dotdrop-git/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: deadc0de6 + +pkgname=dotdrop-git +pkgver= +pkgrel=1 +pkgdesc="Save your dotfiles once, deploy them everywhere " +arch=('any') +url="https://github.com/deadc0de6/dotdrop" +license=('GPL') +groups=() +depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') +makedepends=('git') +provides=(dotdrop) +conflicts=(dotdrop) +source=("git+https://github.com/deadc0de6/dotdrop.git") +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' +} + +package() { + cd "${pkgname}" + python setup.py install --root="${pkgdir}/" --optimize=1 +} + diff --git a/packages/arch/PKGBUILD b/packages/arch-dotdrop/PKGBUILD similarity index 55% rename from packages/arch/PKGBUILD rename to packages/arch-dotdrop/PKGBUILD index ad427cf9c..5095ed004 100644 --- a/packages/arch/PKGBUILD +++ b/packages/arch-dotdrop/PKGBUILD @@ -1,19 +1,25 @@ # Maintainer: deadc0de6 pkgname=dotdrop -pkgver=0.10 +pkgver= pkgrel=1 pkgdesc="Save your dotfiles once, deploy them everywhere " arch=('any') url="https://github.com/deadc0de6/dotdrop" license=('GPL') -groups=() -depends=('python' 'python-jinja' 'python-docopt' 'python-pyaml') +groups=()7 +depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') +makedepends=('git') source=("git+https://github.com/deadc0de6/dotdrop.git") md5sums=('SKIP') +pkgver() { + cd "$pkgname" + git tag -l | tail -1 | sed 's/^v//g' +} + package() { cd "${pkgname}" - python setup.py install --root="${pkgdir}/" + python setup.py install --root="${pkgdir}/" --optimize=1 } diff --git a/packages/arch/.SRCINFO b/packages/arch/.SRCINFO deleted file mode 100644 index 2e695b3be..000000000 --- a/packages/arch/.SRCINFO +++ /dev/null @@ -1,16 +0,0 @@ -pkgbase = dotdrop - pkgdesc = Save your dotfiles once, deploy them everywhere - pkgver = 0.10 - pkgrel = 1 - url = https://github.com/deadc0de6/dotdrop - arch = any - license = GPL - depends = python - depends = python-jinja - depends = python-docopt - depends = python-pyaml - source = git+https://github.com/deadc0de6/dotdrop.git - md5sums = SKIP - -pkgname = dotdrop - From feeacbfdb8490cc3666c2578ab5d7f3ead24e734 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 11:55:50 +0100 Subject: [PATCH 05/12] fix groups --- packages/arch-dotdrop/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arch-dotdrop/PKGBUILD b/packages/arch-dotdrop/PKGBUILD index 5095ed004..f1693236c 100644 --- a/packages/arch-dotdrop/PKGBUILD +++ b/packages/arch-dotdrop/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="Save your dotfiles once, deploy them everywhere " arch=('any') url="https://github.com/deadc0de6/dotdrop" license=('GPL') -groups=()7 +groups=() depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') makedepends=('git') source=("git+https://github.com/deadc0de6/dotdrop.git") From 7c1a04acc4292216298a4791e3c4215649ec90e2 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 11:58:25 +0100 Subject: [PATCH 06/12] fix version tag --- packages/arch-dotdrop/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arch-dotdrop/PKGBUILD b/packages/arch-dotdrop/PKGBUILD index f1693236c..ff526ab2e 100644 --- a/packages/arch-dotdrop/PKGBUILD +++ b/packages/arch-dotdrop/PKGBUILD @@ -15,7 +15,7 @@ md5sums=('SKIP') pkgver() { cd "$pkgname" - git tag -l | tail -1 | sed 's/^v//g' + git describe --abbrev=0 --tags | sed 's/^v//g' } package() { From 142bb2022b282dfe052e8f6512e8c6ed47c949db Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 12:26:34 +0100 Subject: [PATCH 07/12] fix setuptools dependency --- packages/arch-dotdrop-git/PKGBUILD | 2 +- packages/arch-dotdrop/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD index 54d0c4136..ee9500f5f 100644 --- a/packages/arch-dotdrop-git/PKGBUILD +++ b/packages/arch-dotdrop-git/PKGBUILD @@ -8,7 +8,7 @@ arch=('any') url="https://github.com/deadc0de6/dotdrop" license=('GPL') groups=() -depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') +depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') makedepends=('git') provides=(dotdrop) conflicts=(dotdrop) diff --git a/packages/arch-dotdrop/PKGBUILD b/packages/arch-dotdrop/PKGBUILD index ff526ab2e..28a0f1086 100644 --- a/packages/arch-dotdrop/PKGBUILD +++ b/packages/arch-dotdrop/PKGBUILD @@ -8,7 +8,7 @@ arch=('any') url="https://github.com/deadc0de6/dotdrop" license=('GPL') groups=() -depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') +depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') makedepends=('git') source=("git+https://github.com/deadc0de6/dotdrop.git") md5sums=('SKIP') From 861b8e2b83927cc3f97ca1e60e5ca2437fdcf6c6 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 12:43:19 +0100 Subject: [PATCH 08/12] get release from tag --- packages/arch-dotdrop/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/arch-dotdrop/PKGBUILD b/packages/arch-dotdrop/PKGBUILD index 28a0f1086..545ceac8a 100644 --- a/packages/arch-dotdrop/PKGBUILD +++ b/packages/arch-dotdrop/PKGBUILD @@ -10,11 +10,11 @@ license=('GPL') groups=() depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') makedepends=('git') -source=("git+https://github.com/deadc0de6/dotdrop.git") +source=("git+https://github.com/deadc0de6/dotdrop.git#tag=v${pkgver}") md5sums=('SKIP') pkgver() { - cd "$pkgname" + cd "${pkgname}" git describe --abbrev=0 --tags | sed 's/^v//g' } From afe0c714d677a2281980b75e3ec3482f3cc0b92a Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 12:44:35 +0100 Subject: [PATCH 09/12] fix arch release -git --- packages/arch-dotdrop-git/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD index ee9500f5f..c1f399454 100644 --- a/packages/arch-dotdrop-git/PKGBUILD +++ b/packages/arch-dotdrop-git/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: deadc0de6 -pkgname=dotdrop-git +_pkgname=dotdrop +pkgname="${_pkgname}-git" pkgver= pkgrel=1 pkgdesc="Save your dotfiles once, deploy them everywhere " @@ -16,12 +17,12 @@ source=("git+https://github.com/deadc0de6/dotdrop.git") md5sums=('SKIP') pkgver() { - cd "$pkgname" + cd "${_pkgname}" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' } package() { - cd "${pkgname}" + cd "${_pkgname}" python setup.py install --root="${pkgdir}/" --optimize=1 } From c6baa8b260774eb61dc941544f476a77dcbfd96e Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 12:46:50 +0100 Subject: [PATCH 10/12] hardcode pkgver for the git version on arch --- packages/arch-dotdrop-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD index c1f399454..67ecb31a8 100644 --- a/packages/arch-dotdrop-git/PKGBUILD +++ b/packages/arch-dotdrop-git/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=dotdrop pkgname="${_pkgname}-git" -pkgver= +pkgver=0.10.r10.gafe0c71 pkgrel=1 pkgdesc="Save your dotfiles once, deploy them everywhere " arch=('any') From a203652246218e0dbfc42fe91a92994dd716fa4e Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 11 Feb 2018 12:48:44 +0100 Subject: [PATCH 11/12] adding little script to patch PKGBUILDs --- packages/genpkg.sh | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 packages/genpkg.sh diff --git a/packages/genpkg.sh b/packages/genpkg.sh new file mode 100755 index 000000000..3ae98f258 --- /dev/null +++ b/packages/genpkg.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# author: deadc0de6 +# +# update packages +# + +# $1: version +up() +{ + # update pkgver + [ "${1}" != "" ] && sed -i "s/^pkgver=.*$/pkgver=${1}/g" ${pkgfile} + # create srcinfo + rm -f .SRCINFO + makepkg --printsrcinfo > .SRCINFO +} + +# pivot +cur=$(dirname "$(readlink -f "${0}")") +opwd=`pwd` +pkgfile="PKGBUILD" +cd ${cur} + +######################## +# update arch package +# tag release +######################## +dir="arch-dotdrop" +echo "doing ${dir} ..." +cd ${dir} +version="`git describe --abbrev=0 --tags | sed 's/^v//g'`" +up ${version} +cd ${OLDPWD} + +######################## +# update arch package +# git release +######################## +dir="arch-dotdrop-git" +echo "doing ${dir} ..." +cd ${dir} +# replace pkgver +#version="`git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'`" +up +cd ${OLDPWD} + +# pivot back +cd ${opwd} From 3cf3b51807c3468d42b33549ce0bf2c8fa617dd3 Mon Sep 17 00:00:00 2001 From: deadc0de Date: Sun, 11 Feb 2018 12:59:55 +0100 Subject: [PATCH 12/12] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e992dcdd..3fc5cef3e 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,9 @@ to your dotfiles git tree or system-wide [with pypi](#with-pypi). Having dotdrop as a submodule guarantees that anywhere your are cloning your dotfiles git tree from you'll have dotdrop shipped with it. It is the recommended way. -Dotdrop is also available on aur: https://aur.archlinux.org/packages/dotdrop/ +Dotdrop is also available on aur: +* stable: https://aur.archlinux.org/packages/dotdrop/ +* git version: https://aur.archlinux.org/packages/dotdrop-git/ ## As a submodule