Fix path insertion vs appending of <galaxy>/lib for all scripts.

scripts/check_eggs.py

@@ -37,7 +37,7 @@ if config_set:
     config_arg = '-c %s' % config
 
 lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), "..", "lib" ) )
-sys.path.append( lib )
+sys.path.insert( 1, lib )
 
 from galaxy.eggs import Crate
 

scripts/check_galaxy.py

@@ -90,7 +90,7 @@ except:
 
 # find/import twill
 lib_dir = os.path.join( scripts_dir, "..", "lib" )
-sys.path.append( lib_dir )
+sys.path.insert( 1, lib_dir )
 from galaxy import eggs
 import pkg_resources
 pkg_resources.require( "twill" )

scripts/dist-scramble.py

@@ -44,7 +44,7 @@ root.setLevel( 10 )
 root.addHandler( logging.StreamHandler( sys.stdout ) )
 
 lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
-sys.path.append( lib )
+sys.path.insert( 1, lib )
 
 from galaxy.eggs.dist import DistScrambleCrate, ScrambleFailure
 from galaxy.eggs import EggNotFetchable

scripts/get_platforms.py

@@ -5,7 +5,7 @@ import os, sys
 assert sys.version_info[:2] >= ( 2, 4 )
 
 lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), "..", "lib" ) )
-sys.path.append( lib )
+sys.path.insert( 1, lib )
 
 import galaxy
 import pkg_resources

scripts/helper.py

@@ -26,7 +26,7 @@ except:
     sys.exit( 1 )
 
 options.config = os.path.abspath( options.config )
-sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
 
 from galaxy import eggs
 import pkg_resources

scripts/make_egg_packager.py

@@ -17,7 +17,7 @@ root.setLevel( 10 )
 root.addHandler( logging.StreamHandler( sys.stdout ) )
 
 lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), "..", "lib" ) )
-sys.path.append( lib )
+sys.path.insert( 1, lib )
 
 from galaxy.eggs import Crate, EggNotFetchable, py
 import pkg_resources

scripts/scramble.py

@@ -15,7 +15,7 @@ root.setLevel( 10 )
 root.addHandler( logging.StreamHandler( sys.stdout ) )
 
 lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), "..", "lib" ) )
-sys.path.append( lib )
+sys.path.insert( 1, lib )
 
 from galaxy.eggs.scramble import ScrambleCrate, ScrambleFailure, EggNotFetchable
 

scripts/scramble/scripts/DRMAA_python-macosx.py

@@ -10,7 +10,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/DRMAA_python-solaris.py

@@ -10,7 +10,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/DRMAA_python.py

@@ -10,7 +10,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/MySQL_python-solaris.py

@@ -50,7 +50,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/MySQL_python.py

@@ -47,7 +47,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/PyRods.py

@@ -6,7 +6,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/bx_python-solaris.py

@@ -5,7 +5,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/generic.py

@@ -5,7 +5,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/pbs_python.py

@@ -10,7 +10,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/psycopg2-linux.py

@@ -44,7 +44,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/psycopg2-macosx.py

@@ -50,7 +50,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/psycopg2-solaris.py

@@ -47,7 +47,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/psycopg2.py

@@ -44,7 +44,7 @@ if __name__ == '__main__':
         os.chdir( os.path.dirname( sys.argv[0] ) )
 
     # find setuptools
-    sys.path.append( os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
+    sys.path.insert( 1, os.path.abspath( os.path.join( '..', '..', '..', 'lib' ) ) )
     from scramble_lib import *
 
     tag = get_tag()

scripts/scramble/scripts/pysam-solaris.py

@@ -5,7 +5,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/scramble/scripts/pysqlite.py

@@ -10,7 +10,7 @@ if os.path.dirname( sys.argv[0] ) != "":
     os.chdir( os.path.dirname( sys.argv[0] ) )
 
 # find setuptools
-sys.path.append( os.path.join( '..', '..', '..', 'lib' ) )
+sys.path.insert( 1, os.path.join( '..', '..', '..', 'lib' ) )
 from scramble_lib import *
 
 tag = get_tag() # get the tag

scripts/set_dataset_sizes.py

@@ -13,7 +13,7 @@ parser.add_option( '-c', '--config', dest='config', help='Path to Galaxy config
 def init():
 
     options.config = os.path.abspath( options.config )
-    sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
+    sys.path.insert( 1, os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
 
     from galaxy import eggs
     import pkg_resources

scripts/set_user_disk_usage.py

@@ -21,7 +21,7 @@ def init():
     if options.email == 'all':
         options.email = None
 
-    sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
+    sys.path.insert( 1, os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
 
     from galaxy import eggs
     import pkg_resources