summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin King2017-08-13 13:57:53 -0400
committerKevin King2017-08-13 13:58:17 -0400
commit6b990ecc5003c5d4ae42846d7b4f721eca429201 (patch)
tree8123333834bc1254c6511b19b8f21ed1039ff2a3
parenta9d23bb980e5e46d929ca3c9c88e6a07587e1087 (diff)
downloadaur-6b990ecc5003c5d4ae42846d7b4f721eca429201.tar.gz
convert kr-git package to stable
-rw-r--r--PKGBUILD13
-rw-r--r--kr.install4
2 files changed, 8 insertions, 9 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0f7ef46f34d..f37beb1c320 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Danilo <aur ät dbrgn döt ch>
-pkgname=kr-git
-pkgver=r512.598fd9c
+# Maintainer: krypt.co <aur@>
+pkgname=kr
+pkgver=2.2.7
pkgrel=1
pkgdesc="SSH using a key stored in Kryptonite"
arch=('i686' 'x86_64')
@@ -16,14 +16,14 @@ conflicts=('kr')
backup=()
options=()
install=kr.install
-changelog=
-source=("git+https://github.com/kryptco/kr")
+changelog="https://krypt.co/app/krd_changelog/"
+source=("git+https://github.com/kryptco/kr#tag=$pkgver")
md5sums=('SKIP')
validpgpkeys=()
pkgver() {
cd ${srcdir}/src/github.com/kryptco/kr
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
@@ -48,5 +48,6 @@ package() {
install -D -m 755 "bin/kr" "${pkgdir}/usr/bin/kr"
install -D -m 755 "bin/krd" "${pkgdir}/usr/bin/krd"
install -D -m 755 "bin/krssh" "${pkgdir}/usr/bin/krssh"
+ install -D -m 755 "bin/krgpg" "${pkgdir}/usr/bin/krgpg"
install -D -m 755 "bin/kr-pkcs11.so" "${pkgdir}/usr/lib/kr-pkcs11.so"
}
diff --git a/kr.install b/kr.install
index 132fff255ac..6ba1d9b4e7a 100644
--- a/kr.install
+++ b/kr.install
@@ -1,7 +1,5 @@
post_install() {
echo -e "\e[32m\e[1m============================\e[0m"
- echo -e "\e[32mTo enable SSH through kr, please run the following command:\e[0m"
- echo -e "\e[94m"
- echo "echo -e '\\n# Added by Kryptonite\\nHost *\\n\\tPKCS11Provider /usr/lib/kr-pkcs11.so\\n\\tProxyCommand /usr/bin/krssh %h %p\\n\\tIdentityFile ~/.ssh/id_kryptonite\\n\\tIdentityFile ~/.ssh/id_ed25519\\n\\tIdentityFile ~/.ssh/id_rsa\\n\\tIdentityFile ~/.ssh/id_ecdsa\\n\\tIdentityFile ~/.ssh/id_dsa' >> ~/.ssh/config"
+ echo -e "\e[32m'kr pair' will automatically configure ~/.ssh/config to use Kryptonite. To prevent this, export KR_SKIP_SSH_CONFIG=1\e[0m"
echo -e "\e[0m\e[32m\e[1m============================\e[0m"
}