upgpkg: rustup-git 1.25.2.r221.gac7fb954-1

3 files changed, 24 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 395495afd9c1..1f837dbad5a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = rustup-git
 	pkgdesc = The Rust toolchain installer
-	pkgver = 1.25.1.r39.gb3d53252
+	pkgver = 1.25.2.r221.gac7fb954
 	pkgrel = 1
-	url = https://github.com/rust-lang/rustup.rs
+	url = https://github.com/rust-lang/rustup
 	install = post.install
 	arch = x86_64
 	license = MIT
@@ -30,6 +30,8 @@ pkgbase = rustup-git
 	conflicts = rustup
 	replaces = cargo-tree
 	source = rustup-git::git+https://github.com/rust-lang/rustup.git
+	source = list-proxy-names.rs
 	sha512sums = SKIP
+	sha512sums = 3b8cca51fdf62bbd379a5a530e00609fc3192aa1e88b3f392621f356d5e9c6d93cb8767dee2d679bed86baaa369dec77ceb2e3d4d281e4c7c2098b324125deb4
 
 pkgname = rustup-git
diff --git a/PKGBUILD b/PKGBUILD
index c8ad9d01c047..411d570afc63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jonathon Fernyhough <jonathon_at_manjaro_dot_org>
 pkgname=rustup-git
-pkgver=1.25.1.r39.gb3d53252
+pkgver=1.25.2.r221.gac7fb954
 pkgrel=1
 pkgdesc="The Rust toolchain installer"
 arch=('x86_64')
-url="https://github.com/rust-lang/rustup.rs"
+url="https://github.com/rust-lang/rustup"
 license=('MIT' 'Apache')
 depends=('curl')
 makedepends=('git' 'cargo')
@@ -18,33 +18,38 @@ provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustfmt' 'rust-src'
 conflicts=('rust' 'cargo' 'rustfmt' 'rust-nightly' 'rust-nightly-bin' 'rustup')
 replaces=('cargo-tree')
 install='post.install'
-source=("${pkgname}::git+https://github.com/rust-lang/rustup.git")
-sha512sums=('SKIP')
-_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri')
+source=("${pkgname}::git+https://github.com/rust-lang/rustup.git" "list-proxy-names.rs")
+sha512sums=('SKIP'
+            '3b8cca51fdf62bbd379a5a530e00609fc3192aa1e88b3f392621f356d5e9c6d93cb8767dee2d679bed86baaa369dec77ceb2e3d4d281e4c7c2098b324125deb4')
 
 pkgver() {
     cd "$srcdir/${pkgname}"
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+   cd "$srcdir"
+   cp list-proxy-names.rs $pkgname/src/bin
+}
+
 build() {
     cd "$srcdir/$pkgname"
-    env --unset=CARGO_TARGET_DIR cargo build --release --features no-self-update --bin rustup-init
+    env --unset=CARGO_TARGET_DIR cargo build --release --features no-self-update --bin rustup-init --bin list-proxy-names
 }
 
 package() {
     cd "$srcdir/$pkgname"
     install -Dm755 "target/release/rustup-init" "${pkgdir}/usr/bin/rustup"
-    for link in "${_binlinks[@]}"; do
-        ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${link}"
+    for proxy in $(target/release/list-proxy-names); do
+        ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${proxy}"
     done
 
     # Generate completion files.
     mkdir -p "$pkgdir/usr/share/bash-completion/completions"
     "$pkgdir"/usr/bin/rustup completions bash > "$pkgdir/usr/share/bash-completion/completions/rustup"
     "$pkgdir"/usr/bin/rustup completions bash cargo > "$pkgdir/usr/share/bash-completion/completions/cargo"
-    mkdir -p "$pkgdir/usr/share/fish/completions"
-    "$pkgdir"/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/completions/rustup.fish"
+    mkdir -p "$pkgdir/usr/share/fish/vendor_completions.d"
+    "$pkgdir"/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/vendor_completions.d/rustup.fish"
     mkdir -p "$pkgdir/usr/share/zsh/site-functions"
     "$pkgdir"/usr/bin/rustup completions zsh > "$pkgdir/usr/share/zsh/site-functions/_rustup"
     "$pkgdir"/usr/bin/rustup completions zsh cargo > "$pkgdir/usr/share/zsh/site-functions/_cargo"
diff --git a/list-proxy-names.rs b/list-proxy-names.rs
new file mode 100644
index 000000000000..1ef4cba67e08
--- /dev/null
+++ b/list-proxy-names.rs
@@ -0,0 +1,5 @@
+use rustup::TOOLS;
+
+fn main() {
+    println!("{}", TOOLS.join(" "));
+}