diff --git a/deploy/windows/create_exe.py b/deploy/windows/create_exe.py index 7b5ca6f..4f60233 100644 --- a/deploy/windows/create_exe.py +++ b/deploy/windows/create_exe.py @@ -8,33 +8,18 @@ import sys # copy the required files into repo root shutil.copy('docs/favicon.ico', '.') shutil.copy('deploy/windows/instaloader.spec', '.') -shutil.unpack_archive('deploy/windows/ps', '.', 'xztar') code = """ +import contextlib import psutil import subprocess def __main(): - grandparentpid = psutil.Process(os.getppid()).ppid() - grandparentpidsearchstring = ' ' + str(grandparentpid) + ' ' - if hasattr(sys, "_MEIPASS"): - ps = os.path.join(sys._MEIPASS, 'tasklist.exe') - else: - ps = 'tasklist' - popen = subprocess.Popen(ps, stdout=subprocess.PIPE, universal_newlines=True) - for examine in iter(popen.stdout.readline, ""): - if grandparentpidsearchstring in examine: - pname = examine - break - popen.stdout.close() - return_code = popen.wait() - if return_code: - raise subprocess.CalledProcessError(return_code, ps) - if pname[0:12] == 'explorer.exe': - subprocess.Popen("cmd /K \\\"{0}\\\"".format(os.path.splitext(os.path.basename(sys.argv[0]))[0])) - else: - main() - + with contextlib.suppress(AttributeError, psutil.Error): + if psutil.Process().parent().parent().name() == "explorer.exe": + subprocess.Popen("cmd /K \\\"{0}\\\"".format(os.path.splitext(os.path.basename(sys.argv[0]))[0])) + return + main() if __name__ == "__main__": __main() diff --git a/deploy/windows/instaloader.spec b/deploy/windows/instaloader.spec index 42a8f67..25f5e91 100644 --- a/deploy/windows/instaloader.spec +++ b/deploy/windows/instaloader.spec @@ -5,7 +5,7 @@ block_cipher = None a = Analysis(['__main__.py'], binaries=[], - datas=[('tasklist.exe', '.'), ('framedyn.dll', '.')], + datas=[], hiddenimports=[], hookspath=[], runtime_hooks=[], diff --git a/deploy/windows/ps b/deploy/windows/ps deleted file mode 100644 index 6760d35..0000000 Binary files a/deploy/windows/ps and /dev/null differ