From 72c891bbac928cfc4a0ffa37cea15695b91c3552 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 15 Jul 2023 21:48:04 -0400 Subject: [PATCH] remove conhost from windows install process --- installer/create_installer.sh | 3 ++- installer/install.bat.in | 2 +- invokeai/frontend/install/widgets.py | 12 +----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/installer/create_installer.sh b/installer/create_installer.sh index eac0028493..1ab82254a4 100755 --- a/installer/create_installer.sh +++ b/installer/create_installer.sh @@ -24,7 +24,8 @@ read -e -p "Tag this repo with '${VERSION}' and '${LATEST_TAG}'? [n]: " input RESPONSE=${input:='n'} if [ "$RESPONSE" == 'y' ]; then - if ! git tag $VERSION ; then + git push origin :refs/tags/$VERSION + if ! git tag -fa $VERSION ; then echo "Existing/invalid tag" exit -1 fi diff --git a/installer/install.bat.in b/installer/install.bat.in index 8f729e758d..ffe96d4355 100644 --- a/installer/install.bat.in +++ b/installer/install.bat.in @@ -38,7 +38,7 @@ echo https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist echo. echo See %INSTRUCTIONS% for more details. echo. -echo "For the best user experience we suggest enlarging or maximizing this window now." +echo FOR THE BEST USER EXPERIENCE WE SUGGEST MAXIMIZING THIS WINDOW NOW. pause @rem ---------------------------- check Python version --------------- diff --git a/invokeai/frontend/install/widgets.py b/invokeai/frontend/install/widgets.py index c3bb3542ae..9d75badb8d 100644 --- a/invokeai/frontend/install/widgets.py +++ b/invokeai/frontend/install/widgets.py @@ -28,17 +28,7 @@ def set_terminal_size(columns: int, lines: int, launch_command: str=None): OS = platform.uname().system if OS == "Windows": - # The new Windows Terminal doesn't resize, so we relaunch in a CMD window. - # Would prefer to use execvpe() here, but somehow it is not working properly - # in the Windows 10 environment. - if 'IA_RELAUNCHED' not in os.environ: - args=['conhost'] - args.extend([launch_command] if launch_command else [sys.argv[0]]) - args.extend(sys.argv[1:]) - os.environ['IA_RELAUNCHED'] = 'True' - os.execvp('conhost',args) - else: - _set_terminal_size_powershell(width,height) + _set_terminal_size_powershell(width,height) elif OS in ["Darwin", "Linux"]: _set_terminal_size_unix(width,height)