[arch-commits] Commit in rustup/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Monday, April 10, 2017 @ 18:54:55
  Author: svenstaro
Revision: 221899

upgpkg: rustup 1.1.0-2

Fix FS#52449

Modified:
  rustup/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-10 18:54:05 UTC (rev 221898)
+++ PKGBUILD	2017-04-10 18:54:55 UTC (rev 221899)
@@ -1,8 +1,9 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jonathon Fernyhough <jonathon_at_manjaro_dot_org>
 # Contributor: Jon Gjengset <jon at tsp.io>
 pkgname=rustup
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Rust toolchain installer"
 arch=('i686' 'x86_64')
 url="https://github.com/rust-lang-nursery/rustup.rs"
@@ -13,6 +14,7 @@
 install='post.install'
 source=("rustup-${pkgver}.tar.gz::https://github.com/rust-lang-nursery/rustup.rs/archive/${pkgver}.tar.gz")
 md5sums=('ef6fb60ef808bdd13455f723a837b098')
+_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb')
 
 build() {
     msg2 "Building rustup"
@@ -19,16 +21,14 @@
     cd "$srcdir/$pkgname.rs-${pkgver}"
     # cargo update
     cargo build --release --features no-self-update --bin rustup-init
-
-    msg2 "Running rustup-init"
-    mkdir -p "$srcdir/tmp/.cargo"
-    env -u CARGO_HOME "HOME=$srcdir/tmp" target/release/rustup-init -y #--no-modify-path https://github.com/rust-lang-nursery/rustup.rs/issues/856
 }
 
 package() {
     cd "$pkgname.rs-${pkgver}"
-    install -dm755 "$pkgdir/usr/bin"
-    cp "$srcdir/tmp/.cargo/bin"/* "$pkgdir/usr/bin/"
+    install -Dm755 "target/release/rustup-init" "${pkgdir}/usr/bin/rustup"
+    for link in "${_binlinks[@]}"; do
+        ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${link}"
+    done
 
     # Generate completion files.
     mkdir -p "$pkgdir/usr/share/bash-completion/completions"