Commit a43a7556 authored by Volker Hilsheimer's avatar Volker Hilsheimer

Print home_share with machine info, get rid of hack

parent 21ac37ba
......@@ -185,7 +185,7 @@ Vagrant.configure("2") do |config|
config.ssh.shell = machine["shell"] unless machine["shell"].nil?
if ARGV[0] == "info"
puts "#{name} #{machine['os']} #{box.vm.communicator} #{ENV['GUEST_HOMES']}"
puts "#{name} #{machine['os']} #{box.vm.communicator} #{ENV['GUEST_HOMES']} #{ENV["HOME_SHARE"]}"
next
end
......
......@@ -135,7 +135,8 @@ function run_on_machine() {
upload_source="$jobroot/$job"
communicator=$(minicoin info $machine | awk {'print $3'})
machine_info=$(minicoin info $machine)
communicator=$(echo $machine_info | awk {'print $3'})
if [[ $communicator == "winrm" || $communicator == "winssh" ]]
then
[ $communicator == "winssh" ] && communicator="ssh"
......@@ -179,21 +180,14 @@ function run_on_machine() {
fi
fi
# poorest-man yaml parser
if [[ -f "$HOME/minicoin/minicoin.yml" ]]
then
home_share=$(cat $HOME/minicoin/minicoin.yml | grep "home_share:" | awk '{print $2}')
fi
if [[ $host_home == "" ]]
then
home_share=$(cat minicoin.yml | grep "home_share:" | awk '{print $2}')
fi
home_share=$(echo $machine_info | awk {'print $5'})
if [[ $home_share == "" ]]
then
home_share=$HOME
fi
host_home=${home_share/\~/$HOME}
host_home=${home_share/\$HOME/$HOME}
echo $host_home
# job scripts can expect P0 to be home on host, and P1 PWD on host
job_args=( "$host_home" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment