v0.2.0 released

2 files changed, 11 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e10b89ef321..040e6c3fbf9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jun 15 01:13:05 UTC 2016
+# Wed Jun 22 19:52:52 UTC 2016
 pkgbase = rustup-git
 	pkgdesc = The Rust toolchain installer
-	pkgver = 0.1.12.r39.g80731d7
+	pkgver = 0.2.0.r8.g48b7e53
 	pkgrel = 1
 	url = https://github.com/rust-lang-nursery/rustup.rs
 	install = post.install
@@ -26,8 +26,8 @@ pkgbase = rustup-git
 	replaces = multirust
 	replaces = multirust-git
 	source = rustup-git::git+https://github.com/rust-lang-nursery/rustup.rs.git
-	source = rust-1.9.0--unknown-linux-gnu.tar.gz::https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz
-	source = rust-1.9.0--unknown-linux-gnu.tar.gz.asc::https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz.asc
+	source = https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz
+	source = https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz.asc
 	md5sums = SKIP
 	md5sums = dc994c38b56c97081a5006c7553a55e1
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b909a245a33a..7a5dd749c466 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,8 @@
 # Maintainer: Jon Gjengset <jon@tsp.io>
 pkgname=rustup-git
-pkgver=0.1.12.r39.g80731d7
+pkgver=0.2.0.r8.g48b7e53
 pkgrel=1
 
-rustv="1.9.0"
-chn=$(echo "$rustv" | tr '-' ' ' | cut -d' ' -f1)
-date=$(echo "$rustv" | tr '-' ' ' | cut -d' ' -f2- | tr ' ' '-')
-sep="/"
-if [ "$date" == "$rustv" ]; then
-	date=""
-	sep=""
-fi
-if test -n "$date"; then
-	date="-$date"
-fi
-target="rust-$chn-$CARCH-unknown-linux-gnu"
-
 pkgdesc="The Rust toolchain installer"
 arch=('i686' 'x86_64')
 url="https://github.com/rust-lang-nursery/rustup.rs"
@@ -25,10 +12,11 @@ provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustup')
 conflicts=('rust' 'cargo' 'rust-nightly' 'rust-nightly-bin' 'multirust' 'multirust-git' 'rustup')
 replaces=('multirust' 'multirust-git')
 install='post.install'
+
+rust="rust-1.9.0-$CARCH-unknown-linux-gnu"
 source=(
 	"${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git"
-	"$target$date.tar.gz::https://static.rust-lang.org/dist/${date#-}${sep}${target}.tar.gz"
-	"$target$date.tar.gz.asc::https://static.rust-lang.org/dist/${date#-}${sep}${target}.tar.gz.asc"
+	"https://static.rust-lang.org/dist/${rust}.tar.gz"{,.asc}
 )
 # The Rust GPG Key: https://keybase.io/rust
 validpgpkeys=("108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE")
@@ -42,9 +30,9 @@ pkgver() {
 }
 
 build() {
-	# set up nightly cargo
-	cd "$srcdir/$target"
-	msg2 "Setting up cargo $chn ${date#-}"
+	# set up cargo
+	cd "$srcdir/$rust"
+	msg2 "Setting up cargo"
 	./install.sh --prefix="$srcdir/cargo"
 	export PATH="$srcdir/cargo/bin:$PATH"