diff --git a/seedminer/seedminer_launcher3.py b/seedminer/seedminer_launcher3.py index c731516..a6ba083 100644 --- a/seedminer/seedminer_launcher3.py +++ b/seedminer/seedminer_launcher3.py @@ -133,7 +133,7 @@ def mii_gpu(year = 0, model = None): f.write(final) if len(sys.argv) >= 3: model = sys.argv[2].lower() - else: + elif model == None: print("Error: need to specify new|old movable.sed") sys.exit(1) model_str = b"" @@ -181,7 +181,7 @@ def mii_gpu(year = 0, model = None): if os_name == 'nt': init_command = "bfcl lfcs {:08X} {} {} {:08X}".format(start_lfcs, hexlify(model_str).decode('ascii'), hexlify(final[4:4 + 8]).decode('ascii'), endian4(offset_override)) else: - init_command = "./bfcl lfcs {:08X} {} {} {:08X}".format(start_lfcs, hexlify(model_str).decode('ascii'), hexlify(final[4:4 + 8]).decode('ascii'), endian4(offset_override)) + init_command = "wine bfcl lfcs {:08X} {} {} {:08X}".format(start_lfcs, hexlify(model_str).decode('ascii'), hexlify(final[4:4 + 8]).decode('ascii'), endian4(offset_override)) print(init_command) if force_reduced_work_size is True: command = "{} rws".format(init_command) @@ -383,7 +383,7 @@ def do_gpu(): if os_name == 'nt': init_command = "bfcl msky {} {} {:08X} {:08X}".format(keyy, id0, endian4(offset_override), endian4(max_msky_offset)) else: - init_command = "./bfcl msky {} {} {:08X} {:08X}".format(keyy, id0, endian4(offset_override), endian4(max_msky_offset)) + init_command = "wine bfcl msky {} {} {:08X} {:08X}".format(keyy, id0, endian4(offset_override), endian4(max_msky_offset)) print(init_command) if force_reduced_work_size is True: command = "{} rws".format(init_command) @@ -447,7 +447,8 @@ dname = os.path.dirname(abspath) os.chdir(dname) #Here the "__name__" == "__main__" part is needed in order to avoid the script from printing the error messages and exiting when imported from the other script -if "__name__" == "__main__": +if __name__ == "__main__": + print(sys.argv) if len(sys.argv) < 2 or len(sys.argv) > 4: error_print() sys.exit(1)