From ec9b0c0c0bbf4847a1264a18bdc5a55a3042c4ce Mon Sep 17 00:00:00 2001 From: Arnaud Hatzenbuhler Date: Mon, 25 Mar 2024 23:10:17 +0100 Subject: [PATCH 1/2] feat: Allow to install default rust packages --- bin/install | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/bin/install b/bin/install index 185e322..4cca767 100755 --- a/bin/install +++ b/bin/install @@ -69,4 +69,24 @@ install_rust() { ) } +install_default_rust_packages() { + local packages_file="${ASDF_RUST_DEFAULT_PACKAGES_FILE:-$HOME/.default-rust-packages}" + + if [ -f "$packages_file" ]; then + echo -ne "\nInstalling default rust packages..." + while read package + do + echo -ne "\nInstalling rust package $package..." + echo "Pouet : $ASDF_INSTALL_PATH" + PATH="$ASDF_INSTALL_PATH/bin:$PATH" cargo install -f --locked "$package" --root "$ASDF_INSTALL_PATH/.cargo" + done < "$packages_file" + for binary in "$ASDF_INSTALL_PATH/.cargo/bin"/* + do + ln -s "$binary" "$ASDF_INSTALL_PATH/bin/$(basename $binary)" + done + fi +} + + install_rust "$ASDF_INSTALL_TYPE" "$ASDF_INSTALL_VERSION" "$ASDF_INSTALL_PATH" +install_default_rust_packages From a26218d7ca93c31aada6238b2a4b791fb7b530f0 Mon Sep 17 00:00:00 2001 From: Arnaud Hatzenbuhler Date: Mon, 30 Sep 2024 23:09:06 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20(install):=20fix=20shell=20s?= =?UTF-8?q?cript=20syntax=20to=20prevent=20word=20splitting=20and=20globbi?= =?UTF-8?q?ng=20issues=20The=20changes=20made=20in=20the=20script=20includ?= =?UTF-8?q?e=20adding=20the=20-r=20flag=20to=20the=20read=20command=20to?= =?UTF-8?q?=20prevent=20backslashes=20from=20being=20interpreted=20as=20es?= =?UTF-8?q?cape=20characters,=20and=20quoting=20variables=20to=20prevent?= =?UTF-8?q?=20word=20splitting=20and=20globbing=20issues.=20This=20ensures?= =?UTF-8?q?=20that=20the=20script=20behaves=20as=20expected=20and=20handle?= =?UTF-8?q?s=20file=20paths=20and=20package=20names=20correctly.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/install | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/install b/bin/install index 4cca767..32474f2 100755 --- a/bin/install +++ b/bin/install @@ -74,19 +74,16 @@ install_default_rust_packages() { if [ -f "$packages_file" ]; then echo -ne "\nInstalling default rust packages..." - while read package - do + while read -r package; do echo -ne "\nInstalling rust package $package..." echo "Pouet : $ASDF_INSTALL_PATH" PATH="$ASDF_INSTALL_PATH/bin:$PATH" cargo install -f --locked "$package" --root "$ASDF_INSTALL_PATH/.cargo" - done < "$packages_file" - for binary in "$ASDF_INSTALL_PATH/.cargo/bin"/* - do - ln -s "$binary" "$ASDF_INSTALL_PATH/bin/$(basename $binary)" + done <"$packages_file" + for binary in "$ASDF_INSTALL_PATH/.cargo/bin"/*; do + ln -s "$binary" "$ASDF_INSTALL_PATH/bin/$(basename "$binary")" done fi } - install_rust "$ASDF_INSTALL_TYPE" "$ASDF_INSTALL_VERSION" "$ASDF_INSTALL_PATH" install_default_rust_packages