summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Marolt2017-11-03 20:18:25 +0100
committerAndrej Marolt2017-11-03 20:18:25 +0100
commit0fe816721fb7fe5e945dc9b45684a55bdd78a9c0 (patch)
tree39d216dc458c81277c29e850254ef601460af09b
parent3063925bdca62f37a17074950c44f27e5a127067 (diff)
downloadaur-0fe816721fb7fe5e945dc9b45684a55bdd78a9c0.tar.gz
Release v1.1.7
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
-rw-r--r--openshift-source-to-image.install27
3 files changed, 4 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cccc0f60874..cec4c5a2b4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = openshift-source-to-image
pkgdesc = A tool for building/building artifacts from source and injecting into docker images
pkgver = 1.1.7
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/openshift/source-to-image
- install = openshift-source-to-image.install
arch = i686
arch = x86_64
license = Apache
diff --git a/PKGBUILD b/PKGBUILD
index 043ec9dbc4a..2155e856630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,20 @@ pkgname=openshift-source-to-image
_release=v1.1.7
_commit=226afa1
pkgver=1.1.7
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for building/building artifacts from source and injecting into docker images"
arch=('i686' 'x86_64')
url="https://github.com/openshift/source-to-image"
license=('Apache')
-install=${pkgname}.install
source=("https://github.com/openshift/source-to-image/releases/download/${_release}/source-to-image-${_release}-${_commit}-linux-amd64.tar.gz")
md5sums=('e23e47bdef21a82e091512cc83080d4e')
build() {
echo "Installing source-to-image"
+ s2i
}
package() {
install -D -m755 $srcdir/s2i $pkgdir/usr/bin/s2i
+ install -D -m755 $srcdir/sti $pkgdir/usr/bin/sti
}
diff --git a/openshift-source-to-image.install b/openshift-source-to-image.install
deleted file mode 100644
index 96cd0fcced3..00000000000
--- a/openshift-source-to-image.install
+++ /dev/null
@@ -1,27 +0,0 @@
-
-pre_remove()
-{
- echo "Running source-to-image pre_remove script..."
-
- rm /usr/bin/sti
- rm /usr/bin/s2i
-
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_install() {
-
- echo "Running source-to-image post_install script..."
-
- ln -s /usr/bin/s2i /usr/bin/sti
-
- s2i
-
-}