Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 59d12a0

Browse files
committed
Merge pull request #32 from boxen/pass_username
Pass login to script/boxen
2 parents 449196b + 0fdde7e commit 59d12a0

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

app/controllers/splash_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def index
88

99
def script
1010
if user = User.for_short_access_token(params[:token]).first
11-
view = Views::Splash::Script.new(:access_token => user.access_token)
11+
view = Views::Splash::Script.new(:access_token => user.access_token, :login => user.login)
1212

1313
script_file = Rails.root.join('app', 'views', 'splash', 'script.sh.erb')
1414
script = Erubis::Eruby.new(File.read(script_file)).result(:view => view)

app/helpers/views/splash/script.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module Splash
55
class Script
66
def initialize(params = {})
77
@access_token = params.delete(:access_token)
8+
@login = params.delete(:login)
89
end
910

1011
def endpoint
@@ -20,6 +21,10 @@ def access_token
2021
@access_token
2122
end
2223

24+
def login
25+
@login
26+
end
27+
2328
def repo_name
2429
ENV['REPOSITORY']
2530
end

app/views/splash/script.sh.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sudo -p " Password for sudo again: " true
7979

8080
cd /opt/boxen/repo
8181
export BOXEN_REPO_NAME=<%= view.repo_name %>
82-
script/boxen --token <%= "#{view.access_token}" %>
82+
script/boxen --token <%= view.access_token %> --login <%= view.login %>
8383

8484
cd $HOME
8585

0 commit comments

Comments
 (0)