Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-09-23 14:14:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct paths in vagrant scripts

Browse source
This commit is contained in:
Lauren Ko 2020-10-06 14:57:18 -05:00
parent 09fe10307d
commit 6ed234bb68
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vagrant/vagrant-brozzler-new-job.py
View file

@ -33,16 +33,17 @@ def main(argv=[]):
'job_conf_file', metavar='JOB_CONF_FILE', 'job_conf_file', metavar='JOB_CONF_FILE',
help='brozzler job configuration file in yaml') help='brozzler job configuration file in yaml')
args = arg_parser.parse_args(args=argv[1:]) args = arg_parser.parse_args(args=argv[1:])
args.job_conf_file = os.path.realpath(args.job_conf_file)
# cd to path with Vagrantfile so "vagrant ssh" knows what to do # cd to path with Vagrantfile so "vagrant ssh" knows what to do
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.realpath(os.path.dirname(__file__)))
with open(args.job_conf_file, 'rb') as f: with open(args.job_conf_file, 'rb') as f:
subprocess.call([ subprocess.call([
'vagrant', 'ssh', '--', 'vagrant', 'ssh', '--',
'f=`mktemp` && cat > $f && ' 'f=`mktemp` && cat > $f && '
'/home/vagrant/brozzler-ve3/bin/python ' '/opt/brozzler-ve3/bin/python '
'/home/vagrant/brozzler-ve3/bin/brozzler-new-job $f'], '/opt/brozzler-ve3/bin/brozzler-new-job $f'],
stdin=f) stdin=f)
if __name__ == '__main__': if __name__ == '__main__':

2
vagrant/vagrant-brozzler-new-site.py
View file

@ -71,7 +71,7 @@ def main(argv=[]):
options.append('--verbose') options.append('--verbose')
# cd to path with Vagrantfile so "vagrant ssh" knows what to do # cd to path with Vagrantfile so "vagrant ssh" knows what to do
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.realpath(os.path.dirname(__file__)))
cmd = ( cmd = (
'/opt/brozzler-ve3/bin/python /opt/brozzler-ve3/bin/brozzler-new-site ' '/opt/brozzler-ve3/bin/python /opt/brozzler-ve3/bin/brozzler-new-site '