Date: Thursday, May 4, 2023 @ 09:58:58 Author: svenstaro Revision: 1458743
upgpkg: rustup 1.26.0-3: Bring back most binaries to /usr/bin - Remove rls as it's deprecated and no one's using that. - Allow users to still use a separate rust-analyzer installed into the system as it might be more recent. Modified: rustup/trunk/PKGBUILD rustup/trunk/rustup-profile.sh -------------------+ PKGBUILD | 12 ++++++++---- rustup-profile.sh | 6 +----- 2 files changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-04 09:33:20 UTC (rev 1458742) +++ PKGBUILD 2023-05-04 09:58:58 UTC (rev 1458743) @@ -4,7 +4,7 @@ # Contributor: Jon Gjengset <[email protected]> pkgname=rustup pkgver=1.26.0 -pkgrel=2 +pkgrel=3 pkgdesc="The Rust toolchain installer" arch=('x86_64') url="https://github.com/rust-lang/rustup.rs"; @@ -22,8 +22,8 @@ source=("rustup-${pkgver}.tar.gz::https://github.com/rust-lang/rustup.rs/archive/${pkgver}.tar.gz"; "rustup-profile.sh") sha512sums=('bc7cb580640248a601dbafb87c3a9e908b6c687377b4e0f88280576af15527f5837d9463f7831c14b0c274cd3170449e634cd851e0d03ea4ff1d0461d4a941be' - 'd5f96f00016877a538019313837a126490f085b28b3ad3084c7f00170b6a0ca906cb63cb57584b0bf5781e197b57fe1849cb80353e3dc60f0fb222ced6c05988') -_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri' 'rust-analyzer') + '7b9c9ef49a712048cebb36c01dde3fb2239bcd2e6f15dc2ad8e1e33eab33f93ebef746782758d67ee427f64e9b07d0982334530488cb8bbb3f81d2611763eb76') +_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri') build() { cd "$pkgname-${pkgver}" @@ -35,8 +35,12 @@ install -d "${pkgdir}/usr/lib/$pkgname/bin" install -Dm755 "target/release/rustup-init" "${pkgdir}/usr/bin/rustup" for link in "${_binlinks[@]}"; do - ln -s /usr/bin/rustup "${pkgdir}/usr/lib/$pkgname/bin/${link}" + ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${link}" done + + # Special treatment for rust-analyzer to still allow the separate package version to be used. + ln -s /usr/bin/rustup "${pkgdir}/usr/lib/$pkgname/bin/rust-analyzer" + install -Dm755 "$srcdir/$pkgname-profile.sh" "$pkgdir/etc/profile.d/$pkgname.sh" # Generate completion files. Modified: rustup-profile.sh =================================================================== --- rustup-profile.sh 2023-05-04 09:33:20 UTC (rev 1458742) +++ rustup-profile.sh 2023-05-04 09:58:58 UTC (rev 1458743) @@ -1,5 +1 @@ -# Set path to rustup symlinks if they exist - -[ -d /usr/lib/rustup/bin ] && PATH=$PATH:/usr/lib/rustup/bin - -export PATH +export PATH=$PATH:/usr/lib/rustup/bin
