###############################################################################
##
## Copyright (C) 2014-2016, New York University.
## Copyright (C) 2011-2014, NYU-Poly.
## Copyright (C) 2006-2011, University of Utah.
## All rights reserved.
## Contact: contact@vistrails.org
##
## This file is part of VisTrails.
##
## "Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following conditions are met:
##
##  - Redistributions of source code must retain the above copyright notice,
##    this list of conditions and the following disclaimer.
##  - Redistributions in binary form must reproduce the above copyright
##    notice, this list of conditions and the following disclaimer in the
##    documentation and/or other materials provided with the distribution.
##  - Neither the name of the New York University nor the names of its
##    contributors may be used to endorse or promote products derived from
##    this software without specific prior written permission.
##
## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
## THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
## OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
## WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
## OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
## ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
##
###############################################################################
import os
import subprocess
import sys


python = sys.executable
pyfile = 'vistrails/run.py'
path = os.path.abspath(os.path.dirname(__file__))
os.chdir(path)
path = (os.path.join(os.path.dirname(python), 'Scripts') +
        os.pathsep +
        path +
        os.pathsep +
        os.getenv('PATH'))
os.putenv('PATH', path)
filenames = [os.path.abspath(a) for a in sys.argv[1:]]
subprocess.call([python, pyfile] + filenames)

@@ -1975,40 +1975,18 @@
 ble%0A
-pyfile = 'vistrails/run.py'%0Apath
+installdir
  = o
@@ -2031,21 +2031,60 @@
 _))%0A
-os.chdir(path
+pyfile = os.path.join(installdir, 'vistrails/run.py'
 )%0Apa
@@ -2169,20 +2169,26 @@
         
-path
+installdir
  +%0A     
@@ -2237,83 +2237,30 @@
 %0Aos.
-putenv('PATH', path)%0Afilenames = %5Bos.path.abspath(a) for a in sys.argv%5B1:%5D%5D
+environ%5B'PATH'%5D = path
 %0Asub
@@ -2295,15 +2295,18 @@
 %5D + 
-filenames
+sys.argv%5B1:%5D
 )%0A

Update runvistrails.py to allow flags