aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-11-26 15:36:30 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-11-26 15:36:30 +0000
commitf8688e04d74457753a6d991a6be721407d78a8cf (patch)
treee6b19d9bb4cf4c458e185c75268a6c33389138ba
parentc2715cbec8e3ba2c8c5ac9fff5755f0a7d917113 (diff)
downloadalpine_aports-f8688e04d74457753a6d991a6be721407d78a8cf.tar.bz2
alpine_aports-f8688e04d74457753a6d991a6be721407d78a8cf.tar.xz
alpine_aports-f8688e04d74457753a6d991a6be721407d78a8cf.zip
main/aports-build: only upload .latest.txt if its generated
with v3.1 we no longer generate those
-rw-r--r--main/aports-build/APKBUILD8
-rw-r--r--main/aports-build/aports-build8
2 files changed, 8 insertions, 8 deletions
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 3d4e3009e7..f99d4c491a 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=aports-build 2pkgname=aports-build
3pkgver=0.9 3pkgver=0.9
4pkgrel=0 4pkgrel=1
5pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux" 5pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
6url="http://alpinelinux.org" 6url="http://alpinelinux.org"
7arch="noarch" 7arch="noarch"
@@ -44,12 +44,12 @@ package() {
44 44
45} 45}
46 46
47md5sums="28f467dd244de934b7bc6a4a76b17227 aports-build 47md5sums="47ab3e00e8efd9a6fb93ce1b29e62830 aports-build
484ca3699a6df13cc937b267a28207b572 aports-build.initd 484ca3699a6df13cc937b267a28207b572 aports-build.initd
49c02d90b2bb0c48e416b707caa8766c50 mqtt-exec.aports-build.confd" 49c02d90b2bb0c48e416b707caa8766c50 mqtt-exec.aports-build.confd"
50sha256sums="bad4ba5d231709ff3ac85aec9f45c8a3ad0d28b6d1ddffa38fd5f2f7e5debae4 aports-build 50sha256sums="eb5345f20450c9c38f7b39dbd2c62f2d32e58b1605778cc9c014b3acce695dc3 aports-build
51a4a8756bc10d27219f5d569b2ea12450c864be439dac1fccb2b79dd374dd525a aports-build.initd 51a4a8756bc10d27219f5d569b2ea12450c864be439dac1fccb2b79dd374dd525a aports-build.initd
527d2001688c3776ffb53c422dee424bcf0346ae20f3df5c6c2f4944022b19cb4d mqtt-exec.aports-build.confd" 527d2001688c3776ffb53c422dee424bcf0346ae20f3df5c6c2f4944022b19cb4d mqtt-exec.aports-build.confd"
53sha512sums="75b6ab26e050db67b1ba2fbee3e231e3c988acd737fb0f3eb14ae65910a1912ad60c2ac56fa8fac5155922ab0a1c48ec394788349f070d7ce4c48b7c74f7cc03 aports-build 53sha512sums="9ad63905762c0d708e7714b5af03c87605968149e7305ef800ea0e697f83c486d3ab8f0d801e2426119c18c9c98075e6cc923ce0d45239805cd10d5251c4108d aports-build
54e5bb9b219a5e03cc594bd1ffe064d9c531f2dc2f50b4cdf66014c49e9dc42b04133968dda0da0b3d572663523ba47a1d77a945f220a85e699930590bf163739c aports-build.initd 54e5bb9b219a5e03cc594bd1ffe064d9c531f2dc2f50b4cdf66014c49e9dc42b04133968dda0da0b3d572663523ba47a1d77a945f220a85e699930590bf163739c aports-build.initd
5593d26e2055dbb02e863bf76b64a549c100decec3fda612ce96ca1464e6d61befa9f57f202553a25cf323e67e266f532d19c7423ff070943a59b3973946d949fe mqtt-exec.aports-build.confd" 5593d26e2055dbb02e863bf76b64a549c100decec3fda612ce96ca1464e6d61befa9f57f202553a25cf323e67e266f532d19c7423ff070943a59b3973946d949fe mqtt-exec.aports-build.confd"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 7ccbe03d10..8bc1befd60 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -66,6 +66,7 @@ new_release() {
66 local new=$1 66 local new=$1
67 local target="all-release" 67 local target="all-release"
68 local yaml=latest-releases.yaml 68 local yaml=latest-releases.yaml
69 local txt=.latest.txt
69 if [ "$rel" = "edge" ]; then 70 if [ "$rel" = "edge" ]; then
70 target="edge" 71 target="edge"
71 fi 72 fi
@@ -79,10 +80,9 @@ new_release() {
79 fi 80 fi
80 sh mklatest.sh || return 1 81 sh mklatest.sh || return 1
81 ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}" 82 ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}"
82 if ! [ -e "$yaml" ]; then 83 [ -e "$yaml" ] || yaml=""
83 yaml="" 84 [ -e "$txt" ] || txt=""
84 fi 85 rsync -ruv $yaml $txt *"$new"* "$upload_iso" || return 1
85 rsync -ruv $yaml .latest.txt *"$new"* "$upload_iso" || return 1
86 sudo apk del .alpine-release 86 sudo apk del .alpine-release
87 mv current previous 87 mv current previous
88 return 0 88 return 0