Merge pull request #281 from stonebig/master

stonebig · stonebig · commit 2442da250bb0 · 2016-03-07T19:36:12.000+01:00
bug fix winpython Interpreter icon
diff --git a/make.py b/make.py
@@ -501,8 +501,8 @@ def _create_launchers(self):
                              workdir='$EXEDIR\scripts')        
         
         self.create_launcher('WinPython Interpreter.exe', 'python.ico',
-                             command='wscript.exe',
-                             args= r'Noshell.vbs python.bat',
+                             command='$SYSDIR\cmd.exe',
+                             args= r'/k python.bat',
                              workdir='$EXEDIR\scripts')
 
         #self.create_launcher('IDLEX (students).exe', 'python.ico',
@@ -570,7 +570,7 @@ def _create_batch_scripts_initial(self):
         conv = lambda path: ";".join(['%WINPYDIR%\\'+pth for pth in path])
         path = conv(self.prepath) + ";%PATH%;" + conv(self.postpath)
         self.create_batch_script('env.bat', r"""@echo off
-set WINPYDIR=%~dp0..\\""" + self.python_name + r"""
+set WINPYDIR=%~dp0.."""+"\\" + self.python_name + r"""
 set WINPYVER=""" + self.winpyver + r"""
 set HOME=%~dp0..\settings
 set WINPYARCH=WIN32
@@ -794,7 +794,7 @@ def _create_batch_scripts(self):
 if exist "%WINPYDIR%\scripts\ptpython.exe" (
     "%WINPYDIR%\scripts\ptpython.exe" %*
 ) else (
-    "%WINPYDIR%\scripts\ptpython.exe" "%WINPYDIR%\python.exe"  %*
+    "%WINPYDIR%\python.exe"  %*
 )
 """)                
 
