Skip to content

Commit af4a5f6

Browse files
gabebwtjgrathwell
authored andcommitted
Use only one-line commands in installfest
A few students copy-paste the 2-line commands and got a little confused because the first line executed and the second line just sat there. Instead, provide only one-line commands in the installfest. I also added some guidance around the "Your Actual Name"/"Your Actual Email" parts of the git configuration; that's not as relevant to this PR and I'd be happy to split it out if that's better.
1 parent e380061 commit af4a5f6

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

sites/en/installfest/_install_ruby.step

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ console <<-BASH
33
BASH
44

55
message "This downloads and compiles Ruby, which takes a while."
6-
console <<-BASH
7-
rvm use #{version_string(:ruby_short)}
8-
rvm --default use #{version_string(:ruby_short)}
9-
BASH
6+
console "rvm use #{version_string(:ruby_short)}"
7+
console "rvm --default use #{version_string(:ruby_short)}"
108

119
verify do
1210
console "ruby -v"
@@ -29,4 +27,3 @@ div do
2927
message "Once that completes, retry `rvm install #{version_string(:ruby_short)}`"
3028
end
3129
end
32-

sites/en/installfest/configure_git.step

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
message "(If you used RailsInstaller on Windows then you should already have `user.name` and `user.email` configured.)"
22

3-
console <<-BASH
4-
git config --global user.name "Your Actual Name"
5-
git config --global user.email "Your Actual Email"
6-
BASH
3+
message "In the next commands, don't copy-paste the whole thing. Use the name and email address you usually use. Don't use a username (like your github username)."
4+
5+
console 'git config --global user.name "Your Actual Name, In Quotes"'
6+
console 'git config --global user.email "Your Actual Email, In Quotes"'
77

88
important "Use the same email address for heroku, git, github, and ssh."
99

@@ -25,4 +25,3 @@ git config --global color.ui auto
2525
end
2626

2727
next_step "create_an_ssh_key"
28-

sites/en/installfest/deploy_a_rails_app.step

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ step "Deploy your app to Heroku" do
117117

118118
message "Before running the following command (to add to your local git repository), make sure that you are in the `test_app` directory."
119119

120-
console <<-BASH
121-
git add .
122-
git commit -m "Updates for heroku deployment"
123-
BASH
120+
console 'git add .'
121+
console 'git commit -m "Updates for heroku deployment"'
124122
end
125123

126124
step "Deploy (push) to heroku" do
@@ -185,4 +183,3 @@ step "Deploy your app to Heroku" do
185183
end
186184

187185
next_step "get_a_sticker"
188-

0 commit comments

Comments
 (0)