diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | new_ver.txt | 1 | ||||
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | source.ini | 11 | ||||
| -rwxr-xr-x | update.sh | 23 | ||||
| -rwxr-xr-x | wrapper-stamp-telepresence.sh | 13 | ||||
| -rwxr-xr-x | wrapper-telepresence.sh | 13 |
10 files changed, 64 insertions, 59 deletions
@@ -1,7 +1,7 @@ pkgbase = telepresence pkgdesc = Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io - pkgver = 0.88 - pkgrel = 17 + pkgver = 0.93 + pkgrel = 31 url = https://github.com/datawire/telepresence arch = any license = Apache @@ -14,8 +14,8 @@ pkgbase = telepresence depends = socat depends = sshfs depends = torsocks - source = https://github.com/datawire/telepresence/archive/0.88.tar.gz - md5sums = SKIP + source = https://github.com/datawire/telepresence/archive/0.93.tar.gz + md5sums = 2fd2e8fd6236985eccc25aa319306474 pkgname = telepresence diff --git a/.gitignore b/.gitignore index 6b4f9adf7084..b92b05ab87ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ pkg/** **.pkg.tar.xz *.tar.gz *.tar +venv/** @@ -1,9 +1,28 @@ +# SHELL:=/bin/bash +.DEFAULT_GOAL:=update -VERSION ?= $(shell stty -echo; read -p "Latest release: " pwd; stty echo; echo $$pwd) +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: - ./update.sh $(VERSION) + nvchecker source.ini + ./update.sh clean: rm -rf src pkg *.tar.xz *.gz *.pkg.tar + rm -rf $(VIRTUAL_ENV) @@ -1,7 +1,7 @@ # Maintainer: David Stark <david@starkers.org> -pkgver=0.88 -pkgrel=17 +pkgver=0.93 +pkgrel=31 pkgname=telepresence pkgdesc="Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io" arch=('any') @@ -22,28 +22,11 @@ depends=( ) source=("https://github.com/datawire/telepresence/archive/${pkgver}.tar.gz") -md5sums=('SKIP') - -build(){ - curl -Ls "https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64" -o dumb-init - chmod +x dumb-init - cd "${srcdir}/${pkgname}-${pkgver}" - virtualenv --python=python3 telepresence-venv - telepresence-venv/bin/pip install -r dev-requirements.txt - telepresence-venv/bin/pip install . - -} +md5sums=('2fd2e8fd6236985eccc25aa319306474') package(){ - - sed -i "s+${srcdir}/${pkgname}-${pkgver}+/opt/telepresence+g" "${srcdir}/${pkgname}-${pkgver}/telepresence-venv/bin/"* - mkdir -p "${pkgdir}/opt/telepresence/" - cp -R "${srcdir}/${pkgname}-${pkgver}/telepresence-venv/" "${pkgdir}/opt/telepresence/" - - install -Dm 755 "dumb-init" "${pkgdir}/opt/telepresence/dumb-init" - install -Dm 755 "../wrapper-telepresence.sh" "${pkgdir}/usr/bin/telepresence" - install -Dm 755 "../wrapper-stamp-telepresence.sh" "${pkgdir}/usr/bin/stamp-telepresence" - + 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 new file mode 100644 index 000000000000..549d055fc11d --- /dev/null +++ b/new_ver.txt @@ -0,0 +1 @@ +telepresence 0.93 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000000..8930223f7063 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +aiohttp +tornado +nvchecker diff --git a/source.ini b/source.ini new file mode 100644 index 000000000000..84181bbcfc3a --- /dev/null +++ b/source.ini @@ -0,0 +1,11 @@ +[__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 index 5b77c53183d4..5d502c2a889f 100755 --- a/update.sh +++ b/update.sh @@ -1,23 +1,36 @@ #!/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)) -newver="$1" +pkgver="$(cat new_ver.txt | awk '{print $2}')" -if [ ! X${newver} == X ]; then - echo "updating from ${oldver} to ${newver}" +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 -set -eu +# 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=${newver}+g" -i PKGBUILD +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 diff --git a/wrapper-stamp-telepresence.sh b/wrapper-stamp-telepresence.sh deleted file mode 100755 index 31e85ff96254..000000000000 --- a/wrapper-stamp-telepresence.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/opt/telepresence/dumb-init /bin/sh - -# wrap the virtualenv and extend $PATH to include telepresence - -export VIRTUAL_ENV=/opt/telepresence/telepresence-venv -export PATH="${VIRTUAL_ENV}/bin:$PATH" - - -RUNME=stamp-telepresence - - -# pass args on -"${VIRTUAL_ENV}/bin/${RUNME}" $@ diff --git a/wrapper-telepresence.sh b/wrapper-telepresence.sh deleted file mode 100755 index bb625f81b911..000000000000 --- a/wrapper-telepresence.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/opt/telepresence/dumb-init /bin/sh - -# wrap the virtualenv and extend $PATH to include telepresence - -export VIRTUAL_ENV=/opt/telepresence/telepresence-venv -export PATH="${VIRTUAL_ENV}/bin:$PATH" - - -RUNME=telepresence - - -# pass args on -"${VIRTUAL_ENV}/bin/${RUNME}" $@ |