From 2e89027b4e8bd70c3541ef79ef01e7e659fac428 Mon Sep 17 00:00:00 2001 From: Travis Wagner Date: Wed, 19 Apr 2023 00:29:21 -0400 Subject: [PATCH 1/5] add crablang scripts with the original commands --- rustup-init.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/rustup-init.sh b/rustup-init.sh index 9799046b1d..67f3203956 100755 --- a/rustup-init.sh +++ b/rustup-init.sh @@ -729,3 +729,44 @@ get_strong_ciphersuites_for() { } main "$@" || exit 1 + +# cargo -> crabgo +# rustup -> crabup +# rustc -> crabc +# rustdoc -> crabdoc +# rustfmt -> crabfmt + +path_to_rustup=$(which rustup) +path_to_bin=$(dirname "$path_to_rustup") + +# add crabup +path_to_crabup="$path_to_bin/crabup" +touch $path_to_crabup +chmod u+x "$path_to_crabup" +echo "rustup" > "$path_to_crabup" + +# add crabgo +path_to_crabgo="$path_to_bin/crabgo" +touch $path_to_crabgo +chmod u+x "$path_to_crabgo" +echo "cargo" > "$path_to_crabgo" + +# add crabc +path_to_crabc="$path_to_bin/crabc" +touch $path_to_crabc +chmod u+x "$path_to_crabc" +echo "rustc" > "$path_to_crabc" + +# add crabdoc +path_to_crabdoc="$path_to_bin/crabdoc" +touch $path_to_crabdoc +chmod u+x "$path_to_crabdoc" +echo "rustdoc" > "$path_to_crabdoc" + +# add crabfmt +path_to_crabfmt="$path_to_bin/crabfmt" +touch $path_to_crabfmt +chmod u+x "$path_to_crabfmt" +echo "rustfmt" > "$path_to_crabfmt" + +echo "Successfully installed crab toolchain." From 3b8f3c07edce1d75b75ded1b4501c6bfa0438788 Mon Sep 17 00:00:00 2001 From: Travis Wagner Date: Wed, 19 Apr 2023 00:42:43 -0400 Subject: [PATCH 2/5] rename to crabup --- rustup-init.sh => crabup-init.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rustup-init.sh => crabup-init.sh (100%) diff --git a/rustup-init.sh b/crabup-init.sh similarity index 100% rename from rustup-init.sh rename to crabup-init.sh From 3810f774a994f4c563367c87746cd3777c54b24f Mon Sep 17 00:00:00 2001 From: Travis Wagner Date: Wed, 19 Apr 2023 16:33:15 -0400 Subject: [PATCH 3/5] update commands in script to accept args, rename to crabup --- crabup-init.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crabup-init.sh b/crabup-init.sh index 67f3203956..b83dffcb4f 100755 --- a/crabup-init.sh +++ b/crabup-init.sh @@ -25,11 +25,11 @@ RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-https://static.rust-lang.org/rustup}" # NOTICE: If you change anything here, please make the same changes in setup_mode.rs usage() { cat < "$path_to_crabup" +echo "rustup \$@" > "$path_to_crabup" # add crabgo path_to_crabgo="$path_to_bin/crabgo" touch $path_to_crabgo chmod u+x "$path_to_crabgo" -echo "cargo" > "$path_to_crabgo" +echo "cargo \$@" > "$path_to_crabgo" # add crabc path_to_crabc="$path_to_bin/crabc" touch $path_to_crabc chmod u+x "$path_to_crabc" -echo "rustc" > "$path_to_crabc" +echo "rustc \$@" > "$path_to_crabc" # add crabdoc path_to_crabdoc="$path_to_bin/crabdoc" touch $path_to_crabdoc chmod u+x "$path_to_crabdoc" -echo "rustdoc" > "$path_to_crabdoc" +echo "rustdoc \$@" > "$path_to_crabdoc" # add crabfmt path_to_crabfmt="$path_to_bin/crabfmt" touch $path_to_crabfmt chmod u+x "$path_to_crabfmt" -echo "rustfmt" > "$path_to_crabfmt" +echo "rustfmt \$@" > "$path_to_crabfmt" echo "Successfully installed crab toolchain." From 8635479040bf60a1a7a050a4a177ae037551174d Mon Sep 17 00:00:00 2001 From: Travis Wagner Date: Thu, 20 Apr 2023 01:06:38 -0400 Subject: [PATCH 4/5] update --- crabup-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crabup-init.sh b/crabup-init.sh index b83dffcb4f..a547b86fc2 100755 --- a/crabup-init.sh +++ b/crabup-init.sh @@ -12,7 +12,7 @@ if [ "$KSH_VERSION" = 'Version JM 93t+ 2010-03-05' ]; then # The version of ksh93 that ships with many illumos systems does not # support the "local" extension. Print a message rather than fail in # subtle ways later on: - echo 'rustup does not work with this ksh93 version; please try bash!' >&2 + echo 'crabup does not work with this ksh93 version; please try bash!' >&2 exit 1 fi From d2c7281f26c5519997e6240572e0daea763ffe7b Mon Sep 17 00:00:00 2001 From: Travis Wagner Date: Thu, 20 Apr 2023 22:35:02 -0400 Subject: [PATCH 5/5] add replace scripts --- crabup-init.sh | 64 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/crabup-init.sh b/crabup-init.sh index a547b86fc2..6f7bd1469a 100755 --- a/crabup-init.sh +++ b/crabup-init.sh @@ -728,13 +728,53 @@ get_strong_ciphersuites_for() { fi } -main "$@" || exit 1 +replace_script=$(cat<<-CRAB +while IFS= read -r line +do + # rename + output=\${line//rust/crab} + output=\${output//Rust/Crab} + output=\${output//RUST/CRAB} + output=\${output//cargo/crabgo} + output=\${output//Cargo/Crabgo} + output=\${output//CARGO/CRABGO} + + # clean up + output=\${output//.crabgo/.cargo} + output=\${output//Crabgo.lock/Cargo.toml} + output=\${output//Crabgo.lock/Cargo.lock} + + # print + echo "\${output}" +done +CRAB +) +replace_script="{\n$replace_script\n}" + +replace_with_crab() { + while IFS= read -r line + do + # rename + output=${line//rust/crab} + output=${output//Rust/Crab} + output=${output//RUST/CRAB} + output=${output//cargo/crabgo} + output=${output//Cargo/Crabgo} + output=${output//CARGO/CRABGO} + + # clean up + output=${output//.crabgo/.cargo} + output=${output//Crabgo.lock/Cargo.toml} + output=${output//Crabgo.lock/Cargo.lock} + output=${output//crabgo.toml/cargo.toml} + output=${output//.crabup/.rustup} + + echo "${output}" + done +} -# cargo -> crabgo -# rustup -> crabup -# rustc -> crabc -# rustdoc -> crabdoc -# rustfmt -> crabfmt +# install +(main "$@" || exit 1) | replace_with_crab path_to_rustup=$(which rustup) path_to_bin=$(dirname "$path_to_rustup") @@ -743,30 +783,28 @@ path_to_bin=$(dirname "$path_to_rustup") path_to_crabup="$path_to_bin/crabup" touch $path_to_crabup chmod u+x "$path_to_crabup" -echo "rustup \$@" > "$path_to_crabup" +echo "rustup \$@ | $replace_script" > "$path_to_crabup" # add crabgo path_to_crabgo="$path_to_bin/crabgo" touch $path_to_crabgo chmod u+x "$path_to_crabgo" -echo "cargo \$@" > "$path_to_crabgo" +echo "cargo \$@ | $replace_script" > "$path_to_crabgo" # add crabc path_to_crabc="$path_to_bin/crabc" touch $path_to_crabc chmod u+x "$path_to_crabc" -echo "rustc \$@" > "$path_to_crabc" +echo "rustc \$@ | $replace_script" > "$path_to_crabc" # add crabdoc path_to_crabdoc="$path_to_bin/crabdoc" touch $path_to_crabdoc chmod u+x "$path_to_crabdoc" -echo "rustdoc \$@" > "$path_to_crabdoc" +echo "rustdoc \$@ | $replace_script" > "$path_to_crabdoc" # add crabfmt path_to_crabfmt="$path_to_bin/crabfmt" touch $path_to_crabfmt chmod u+x "$path_to_crabfmt" -echo "rustfmt \$@" > "$path_to_crabfmt" - -echo "Successfully installed crab toolchain." +echo "rustfmt \$@ | $replace_script" > "$path_to_crabfmt"