Merge pull request #200 from takluyver/cmd-installdir

Fix locating installdir in command wrappers

nsist/commands.py

@@ -8,7 +8,7 @@ from zipfile import ZipFile
 SCRIPT_TEMPLATE = u"""# -*- coding: utf-8 -*-
 import sys, os
 import site
-installdir = os.path.dirname(os.path.dirname(__file__))
+installdir = os.path.dirname(os.path.dirname(sys.executable))
 pkgdir = os.path.join(installdir, 'pkgs')
 sys.path.insert(0, pkgdir)
 # Ensure .pth files in pkgdir are handled properly

nsist/tests/console_example/installer.cfg

@@ -6,7 +6,7 @@ entry_point=sample_printer:main
 console=true
 
 [Python]
-version=3.6.3
+version=3.8.3
 bitness=64
 format=bundled
 

nsist/tests/test_main.py

@@ -82,15 +82,19 @@ def test_installer(console_eg_copy, tmp_path):
     res = run([str(inst_python), str(inst_launch_script)],
               check=True, stdout=PIPE)
     json_res = json.loads(res.stdout.decode('utf-8', 'replace'))
+    print(res.stdout.decode('utf-8', 'replace'))
 
     assert json_res['py_executable'] == str(inst_python)
-    assert json_res['py_version'].startswith('3.6.3')  # Set in installer.cfg
+    assert json_res['py_version'].startswith('3.8.3')  # Set in installer.cfg
     assert json_res['data_file_path'].endswith('data.txt')
     assert json_res['data_file_content'] == 'newt'
 
     # Run through command-line wrapper
     res2 = run([str(inst_exe_wrapper)], check=True, stdout=PIPE)
+    print("Command line wrapper -----------------------------------------")
+    print(res2.stdout.decode('utf-8', 'replace'))
     json_res2 = json.loads(res2.stdout.decode('utf-8', 'replace'))
+
     assert json_res2 == json_res
 
     # Check command-line wrapper is on PATH