Skip to content

Commit d52d8bb

Browse files
committed
Restore original name for init script
1 parent bea2384 commit d52d8bb

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

ansible/roles/dev-desktop/files/scripts/help.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
echo "# Available scripts for managing your Rust checkouts"
4-
echo "init.sh | first time setup, you should only have to execute this once on a new machine"
4+
echo "setup_rustup.sh | first time setup, you should only have to execute this once on a new machine"
55
echo "status.sh | list the branches and git status of all copies of the Rust repo"
66
echo "new_worktree.sh | creates a worktree (shallow copy of the main git checkout of Rust, sharing the .git folder)"
77
echo "detach_merged_prs.sh | invokes \"git pull --fast-forward-only\" on all worktrees and detaches those that are equal to the \"master\" branch"

ansible/roles/dev-desktop/files/scripts/init.sh

100755100644
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,5 @@
55
set -euo pipefail
66
IFS=$'\n\t'
77

8-
# Check if rustup is already installed and exit if that's the case.
9-
if command -v rustup &>/dev/null; then
10-
rustup --version
11-
exit 0
12-
fi
13-
148
init_git.py
15-
16-
echo "Installing rustup..."
17-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
9+
setup_rustup.sh
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
# Enable strict mode for Bash
4+
# http://redsymbol.net/articles/unofficial-bash-strict-mode/
5+
set -euo pipefail
6+
IFS=$'\n\t'
7+
8+
# Check if rustup is already installed and exit if that's the case.
9+
if command -v rustup &>/dev/null; then
10+
rustup --version
11+
exit 0
12+
fi
13+
14+
echo "Installing rustup..."
15+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

0 commit comments

Comments
 (0)