1.1 --- a/OpenSecurity/bin/cygwin.py Tue Feb 18 10:36:55 2014 +0100
1.2 +++ b/OpenSecurity/bin/cygwin.py Tue Feb 18 12:57:28 2014 +0100
1.3 @@ -59,6 +59,7 @@
1.4 theClass.cygwin_bin = os.path.join(theClass.cygwin_root, 'bin') + os.path.sep
1.5 theClass.cygwin_bash = os.path.join(theClass.cygwin_bin, 'bash.exe')
1.6 theClass.cygwin_ssh = os.path.join(theClass.cygwin_bin, 'ssh.exe')
1.7 + theClass.cygwin_x11 = os.path.join(theClass.cygwin_bin, 'XWin.exe')
1.8 theClass.win_cmd = os.environ.get("COMSPEC", "cmd.exe")
1.9
1.10 """get the path to the VirtualBox installation on this system"""
1.11 @@ -77,6 +78,7 @@
1.12 cygwin_bin = ''
1.13 cygwin_bash = ''
1.14 cygwin_ssh = ''
1.15 + cygwin_x11 = ''
1.16 vbox_root = ''
1.17 vbox_man = ''
1.18 win_cmd = ''
1.19 @@ -102,6 +104,10 @@
1.20 @staticmethod
1.21 def ssh():
1.22 return Cygwin.cygwin_ssh
1.23 +
1.24 + @staticmethod
1.25 + def x11():
1.26 + return Cygwin.cygwin_x11
1.27
1.28 @staticmethod
1.29 def vboxman():
1.30 @@ -143,7 +149,7 @@
1.31
1.32 @staticmethod
1.33 def bashExecute(command, wait_return=True, window = False, bash_opts=''):
1.34 - command = bash_opts + ' --login -c ' + command
1.35 + command = bash_opts + ' -l -c ' + command
1.36 return Cygwin.execute(Cygwin.cygwin_bash, command, wait_return, window)
1.37
1.38 @staticmethod
1.39 @@ -181,7 +187,7 @@
1.40 if Cygwin.is_X11_running():
1.41 return
1.42 # launch X11 (forget output and return immediately)
1.43 - return Cygwin.bashExecute('"/usr/bin/X :0 -multiwindow"', bash_opts=' -i ', wait_return = False)
1.44 + return Cygwin.execute(Cygwin.cygwin_x11, ':0 -multiwindow', wait_return = False, window = False)
1.45
1.46 @staticmethod
1.47 def cygPath(path):