Automatically use 64/32bit 7z depending on host architecture on Windows

07th-mod · May 5, 2019 · 79a286b · 79a286b
1 parent b49d0b1
commit 79a286b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bootstrap/higu_win_installer_32/install_data/7za64.exe b/bootstrap/higu_win_installer_32/install_data/7za64.exe
diff --git a/common.py b/common.py
@@ -111,7 +111,7 @@ def scanForExecutables():
 			print("ERROR: aria2c executable not found (aria2c). Please install the dependencies for your platform.")
 			exitWithError()
 
-		Globals.SEVEN_ZIP_EXECUTABLE = findWorkingExecutablePath(["./7za", "./.7za", "7za", "./7z", "7z"], '-h')
+		Globals.SEVEN_ZIP_EXECUTABLE = findWorkingExecutablePath(["./7za64", "./7za", "./.7za", "7za", "./7z", "7z"], '-h')
 		if Globals.SEVEN_ZIP_EXECUTABLE is None:
 			# TODO: automatically download and install dependencies
 			print("ERROR: 7-zip executable not found (7za or 7z). Please install the dependencies for your platform.")

diff --git a/travis_build_script.py b/travis_build_script.py
@@ -84,8 +84,8 @@ def ignore_filter(folderPath, folderContents):
 
 # RELATIVE PATHS MUST CONTAIN ./
 tar_gz(f'./{bootstrap_copy_folder}/higu_linux64_installer/', os.path.join(output_folder, '07th-Mod.Installer.linux.tar.gz'))
-zip(f'./{bootstrap_copy_folder}/higu_win_installer/', os.path.join(output_folder, '07th-Mod.Installer.win64.zip'))
-zip(f'./{bootstrap_copy_folder}/higu_win_installer_32/', os.path.join(output_folder, '07th-Mod.Installer.win32.zip'))
+# zip(f'./{bootstrap_copy_folder}/higu_win_installer/', os.path.join(output_folder, '07th-Mod.Installer.win64.zip'))
+zip(f'./{bootstrap_copy_folder}/higu_win_installer_32/', os.path.join(output_folder, '07th-Mod.Installer.win.zip'))
 
 # NOTE: mac zip doesn't need subdir - use '/*' to achieve this
 zip(f'./{bootstrap_copy_folder}/higu_mac_installer/*', os.path.join(output_folder, '07th-Mod.Installer.mac.zip'))