← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/interpret.py

Merge setup-stuff.

phpBB is gone, configuration, setup and jail building are completely redone.

Please read doc/setup/install_proc.txt, or you'll not get far.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/interpret.py
138
138
 
139
139
    # usage: tramp uid jail_dir working_dir script_path
140
140
    pid = subprocess.Popen(
141
 
        [trampoline, str(uid), jail_dir, working_dir, interpreter,
 
141
        [trampoline, str(uid), ivle.conf.jail_base, ivle.conf.jail_src_base,
 
142
         ivle.conf.jail_system, jail_dir, working_dir, interpreter,
142
143
        script_path],
143
144
        stdin=f, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
144
145
        cwd=tramp_dir)
433
434
 
434
435
    # Fire up trampoline. Vroom, vroom.
435
436
    proc = subprocess.Popen(
436
 
        [tramp, str(user.unixid), jail_dir, working_dir, binary] + args,
 
437
        [tramp, str(user.unixid), ivle.conf.jail_base,
 
438
         ivle.conf.jail_src_base, ivle.conf.jail_system, jail_dir,
 
439
         working_dir, binary] + args,
437
440
        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
438
441
        stderr=subprocess.PIPE, cwd=tramp_dir, close_fds=True)
439
442
    exitcode = proc.wait()