Skip to content
Permalink
Browse files

Merge branch 'v2.1' into 'master'

  • Loading branch information...
remram44 committed Oct 17, 2014
2 parents dbde600 + 65a6a50 commit a81728332f8c46c3e86bac9604ebb68fb7f91a09
@@ -13,15 +13,6 @@ To run it, open the folder in finder and double-click on the VisTrails icon.

Please see the About Message for Licensing and Disclaimers.

Using VisTrails.command
---------------------------

If you would like to see the messages sent to standard output while executing
VisTrails, you may use the VisTrails.command file. If you dragged the VisTrails
folder to a place other than /Applications folder, you might need to execute
path/to/VisTrails/scripts/update_vistrails_command.py script from where your
folder is located.


Release Name: v2.1.4 build 269e4808eca3 from v2.1 branch

@@ -2,7 +2,9 @@
#If you get an error saying:
#Found another instance of VisTrails running
#Sending parameters to main instance []
#Failed: QLocalSocket::connectToServer: Connection refused
#Failed: QLocalSocket::connectToServer: Connection refused
#make sure VisTrails is not already running and simply try to run the script again
#This might indicate that VisTrails did not quit properly
DYLD_LIBRARY_PATH= /Applications/VisTrails/VisTrails.app/Contents/MacOS/vistrails
#This might indicate that VisTrails did not quit properly

cd "$(dirname "$0")"
DYLD_LIBRARY_PATH= VisTrails.app/Contents/MacOS/vistrails
@@ -62,27 +62,27 @@ for dir in $OLD_DIRS
do
if [ -e "$2/$BIN_PATH/$dir" ]
then
rm -r $2/$BIN_PATH/$dir
rm -r "$2/$BIN_PATH/$dir"
fi
done

if [ -e "$2/$BIN_PATH/$ROOT_DIR_NAME" ]
then
rm -r $2/$BIN_PATH/$ROOT_DIR_NAME
rm -r "$2/$BIN_PATH/$ROOT_DIR_NAME"
fi
ln -s -f -F $1/$ROOT_DIR_NAME $2/$BIN_PATH/$ROOT_DIR_NAME
ln -s -f -F "$1/$ROOT_DIR_NAME" "$2/$BIN_PATH/$ROOT_DIR_NAME"

if [ -e "$2/$BIN_PATH/../../run.py" ]
then
rm $2/$BIN_PATH/../../run.py
rm "$2/$BIN_PATH/../../run.py"
fi
ln -s -f -F $1/$ROOT_DIR_NAME/run.py $2/$BIN_PATH/../../run.py
ln -s -f -F "$1/$ROOT_DIR_NAME/run.py" "$2/$BIN_PATH/../../run.py"

if [ -e "$2/../$EXAMPLES_DIR_NAME" ]
then
rm -r $2/../$EXAMPLES_DIR_NAME
rm -r "$2/../$EXAMPLES_DIR_NAME"
fi
ln -s -f -F $1/$EXAMPLES_DIR_NAME $2/../$EXAMPLES_DIR_NAME
ln -s -f -F "$1/$EXAMPLES_DIR_NAME" "$2/../$EXAMPLES_DIR_NAME"


exit 0
@@ -33,31 +33,29 @@
## ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
##
###############################################################################
""" This script assumes that VisTrails.command file is located at ../
Run this script after you copied the VisTrails folder and run from where it
is located.
""" This script assumes that VisTrails.command file is located at ../
Run this script after you copied the VisTrails folder and run from where it
is located.
"""
import os, os.path

if __name__ == "__main__":
# get VisTrails folder
vt_folder = os.path.abspath(os.path.join(os.path.dirname(__file__),'..'))
app_command = os.path.join(vt_folder,'VisTrails.app/Contents/MacOS/vistrails')
command_file = os.path.join(vt_folder, 'VisTrails.command')
file_header = """#This will execute VisTrails in a separate terminal window

file_contents = """#This will execute VisTrails in a separate terminal window
#If you get an error saying:
#Found another instance of VisTrails running
#Sending parameters to main instance []
#Failed: QLocalSocket::connectToServer: Connection refused
#Failed: QLocalSocket::connectToServer: Connection refused
#make sure VisTrails is not already running and simply try to run the script again
#This might indicate that VisTrails did not quit properly
#This might indicate that VisTrails did not quit properly
cd "$(dirname "$0")"
DYLD_LIBRARY_PATH= VisTrails.app/Contents/MacOS/vistrails
"""
file_contents = "DYLD_LIBRARY_PATH= " + app_command
f = open(command_file, 'w')
f.write(file_header)
f.write(file_contents)
f.close()

0 comments on commit a817283

Please sign in to comment.
You can’t perform that action at this time.