summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Birks2019-05-03 16:05:27 -0400
committerDavid Birks2019-05-03 16:05:27 -0400
commit150011a2094dc92390f252be0d7ac2b083a723cc (patch)
tree2ae205d4a46762de8bef2665c12f482277571e16
parentd2a52d5245b00b539fa02c0b6929f4466158dfdb (diff)
downloadaur-150011a2094dc92390f252be0d7ac2b083a723cc.tar.gz
Update to 0.99
-rw-r--r--.SRCINFO14
-rw-r--r--.gitignore2
-rw-r--r--Makefile28
-rw-r--r--PKGBUILD36
-rw-r--r--new_ver.txt1
-rw-r--r--requirements.txt3
-rw-r--r--source.ini11
-rwxr-xr-xupdate.sh39
8 files changed, 20 insertions, 114 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 761583b8371..6544bdcf31e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
pkgbase = telepresence
- pkgdesc = Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io
- pkgver = 0.97
- pkgrel = 34
- url = https://github.com/datawire/telepresence
- arch = any
+ pkgdesc = Local development against a remote Kubernetes or OpenShift cluster
+ pkgver = 0.99
+ pkgrel = 1
+ url = https://github.com/telepresenceio/telepresence
+ arch = x86_64
license = Apache
makedepends = git
depends = conntrack-tools
@@ -11,8 +11,8 @@ pkgbase = telepresence
depends = socat
depends = sshfs
depends = torsocks
- source = https://github.com/datawire/telepresence/archive/0.97.tar.gz
- md5sums = 93d6c261338d3142e1eb0f6561462278
+ source = https://github.com/telepresenceio/telepresence/archive/0.99.tar.gz
+ sha256sums = c4a44fa70437290437f76077c494507b1723c38512a8827996095545ba9773a3
pkgname = telepresence
diff --git a/.gitignore b/.gitignore
index b92b05ab87b..86efde5c209 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ pkg/**
**.pkg.tar.xz
*.tar.gz
*.tar
-venv/**
+telepresence*
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 768a1f8c629..00000000000
--- a/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# SHELL:=/bin/bash
-.DEFAULT_GOAL:=update
-
-export ROOTDIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-
-# ## Install all dependencies
-# # Usage:
-# # make deps
-# deps: deps-python
-
-# #/ activates virenv and installs deps
-# deps-python:
-# @cd "$(ROOTDIR)"
-# @if [ ! -d $(VIRTUAL_ENV)/bin ] ; \
-# then \
-# virtualenv --python=python3 "$(VIRTUAL_ENV)" ;\
-# fi
-# @. $(VIRTUAL_ENV)/bin/activate ; \
-# $(VIRTUAL_ENV)/bin/pip3 install -r $(ROOTDIR)/requirements.txt -q
-
-## Update (automatic)
-update:
- nvchecker source.ini
- ./update.sh
-
-clean:
- rm -rf src pkg *.tar.xz *.gz *.pkg.tar
- rm -rf $(VIRTUAL_ENV)
diff --git a/PKGBUILD b/PKGBUILD
index f9a8370c4f2..41e0c446ba0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,18 @@
-# Maintainer: David Stark <david@starkers.org>
+# Maintainer: David Birks <david@tellus.space>
-pkgver=0.97
-pkgrel=34
+pkgver=0.99
+pkgrel=1
pkgname=telepresence
-pkgdesc="Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io"
-arch=('any')
+pkgdesc='Local development against a remote Kubernetes or OpenShift cluster'
+arch=('x86_64')
license=('Apache')
-url="https://github.com/datawire/telepresence"
-makedepends=(
- 'git'
-)
-backup=()
-depends=(
- 'conntrack-tools'
- 'fuse2'
- 'socat'
- 'sshfs'
- 'torsocks'
-)
+url='https://github.com/telepresenceio/telepresence'
+source=("https://github.com/telepresenceio/telepresence/archive/${pkgver}.tar.gz")
+sha256sums=('c4a44fa70437290437f76077c494507b1723c38512a8827996095545ba9773a3')
+makedepends=('git')
+depends=('conntrack-tools' 'fuse2' 'socat' 'sshfs' 'torsocks')
-source=("https://github.com/datawire/telepresence/archive/${pkgver}.tar.gz")
-md5sums=('93d6c261338d3142e1eb0f6561462278')
-
-package(){
- cd ${srcdir}/${pkgname}-${pkgver}
+package() {
+ cd ${srcdir}/$pkgname-$pkgver
env PREFIX=${pkgdir}/usr ./install.sh
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/new_ver.txt b/new_ver.txt
deleted file mode 100644
index 265b41263f0..00000000000
--- a/new_ver.txt
+++ /dev/null
@@ -1 +0,0 @@
-telepresence 0.97
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 8930223f706..00000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-aiohttp
-tornado
-nvchecker
diff --git a/source.ini b/source.ini
deleted file mode 100644
index 84181bbcfc3..00000000000
--- a/source.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[__config__]
-oldver = old_ver.txt
-newver = new_ver.txt
-
-
-
-[telepresence]
-github = telepresenceio/telepresence
-; github = geofffranks/spruce
-; use_latest_release = true
-use_max_tag = true
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 5d502c2a889..00000000000
--- a/update.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-
-oldver="$(grep ^pkgver= PKGBUILD | cut -d "=" -f 2)"
-oldrel="$(grep ^pkgrel= PKGBUILD | cut -d "=" -f 2)"
-md5old="$(grep md5sums PKGBUILD | cut -d "'" -f 2)"
-newrel=$(($oldrel + 1))
-
-pkgver="$(cat new_ver.txt | awk '{print $2}')"
-
-if [ ! X${pkgver} == X ]; then
- echo "updating from ${oldver} to ${pkgver}"
-else
- echo "please specify a release number.. see: https://github.com/datawire/telepresence/releases"
- exit 1
-fi
-set -x
-
-# determine new md5sum
-tempdir="$(mktemp -d)"
-tempfile="${tempdir}/filename"
-curl -sL https://github.com/telepresenceio/telepresence/archive/${pkgver}.tar.gz -o "${tempfile}"
-md5new="$(md5sum "${tempfile}" | awk '{print $1}')"
-# rm -rf "${tempdir}"
-
-echo md5old=${md5old}, md5new=${md5new}
-
-#update the buildfile
-sed "s+pkgver=${oldver}+pkgver=${pkgver}+g" -i PKGBUILD
-sed "s+pkgrel=${oldrel}+pkgrel=${newrel}+g" -i PKGBUILD
-sed "s+${md5old}+${md5new}+g" -i PKGBUILD
-
-set -eu
-
-makepkg -f
-
-#update srcinfo
-makepkg --printsrcinfo > .SRCINFO
-