aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
-rw-r--r--install.sh20
3 files changed, 13 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 77fe508426b4..80c086a9a6cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openshift-origin-git
pkgdesc = OpenShift Origin is a platform for developing, building, and deploying containerized applications. See https://docs.openshift.org/latest for more on running OpenShift Origin.
pkgver = 1.0.0
- pkgrel = 9
+ pkgrel = 10
url = https://github.com/openshift/origin
install = install.sh
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index c1b5cb175856..72933ed91efa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Andrej Marolt <andrej.marolt@gmail.com>
pkgname=openshift-origin-git
pkgver=1.0.0
-pkgrel=9
+pkgrel=10
pkgdesc="OpenShift Origin is a platform for developing, building, and deploying containerized applications. See https://docs.openshift.org/latest for more on running OpenShift Origin."
arch=(x86_64)
url="https://github.com/openshift/origin"
@@ -26,6 +26,7 @@ build() {
cd ./_output/local/bin/linux/amd64/
mv ./openshift $srcdir/
mv ./oc $srcdir/
+ mv ./kubefed $srcdir/
}
package() {
diff --git a/install.sh b/install.sh
index 67259848d9e4..565c10f10f13 100644
--- a/install.sh
+++ b/install.sh
@@ -3,16 +3,16 @@ pre_remove()
{
echo "Running openshift pre_remove script..."
- rm /usr/bin/kube-apiserver
- rm /usr/bin/kube-controller-manager
- rm /usr/bin/kubelet
- rm /usr/bin/kube-proxy
- rm /usr/bin/kube-scheduler
- rm /usr/bin/oadm
- rm /usr/bin/kubectl
- rm /usr/bin/openshift
- rm /usr/bin/oc
- rm /usr/bin/kubefed
+ rm -f -- /usr/bin/kube-apiserver
+ rm -f -- /usr/bin/kube-controller-manager
+ rm -f -- /usr/bin/kubelet
+ rm -f -- /usr/bin/kube-proxy
+ rm -f -- /usr/bin/kube-scheduler
+ rm -f -- /usr/bin/oadm
+ rm -f -- /usr/bin/kubectl
+ rm -f -- /usr/bin/openshift
+ rm -f -- /usr/bin/oc
+ rm -f -- /usr/bin/kubefed
}