From 54d8feeaf0b387ff3908b57e62b8656b23bc8240 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 7 Oct 2022 19:48:24 +0530 Subject: [PATCH 1/2] Rename dev console script --- scripts/{Open Developer Console.cmd => Developer Console.cmd} | 0 scripts/{open_dev_console.sh => developer_console.sh} | 0 scripts/on_env_start.bat | 2 +- scripts/on_env_start.sh | 2 +- scripts/on_sd_start.bat | 2 +- scripts/on_sd_start.sh | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename scripts/{Open Developer Console.cmd => Developer Console.cmd} (100%) rename scripts/{open_dev_console.sh => developer_console.sh} (100%) diff --git a/scripts/Open Developer Console.cmd b/scripts/Developer Console.cmd similarity index 100% rename from scripts/Open Developer Console.cmd rename to scripts/Developer Console.cmd diff --git a/scripts/open_dev_console.sh b/scripts/developer_console.sh similarity index 100% rename from scripts/open_dev_console.sh rename to scripts/developer_console.sh diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 749701cd..a73198ce 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -55,7 +55,7 @@ if "%update_branch%"=="" ( @xcopy sd-ui-files\ui ui /s /i /Y @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y -@copy "sd-ui-files\scripts\Open Developer Console.cmd" . /Y +@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y @call scripts\on_sd_start.bat diff --git a/scripts/on_env_start.sh b/scripts/on_env_start.sh index 1f2d505d..3a934153 100755 --- a/scripts/on_env_start.sh +++ b/scripts/on_env_start.sh @@ -37,7 +37,7 @@ rm -rf ui cp -Rf sd-ui-files/ui . cp sd-ui-files/scripts/on_sd_start.sh scripts/ cp sd-ui-files/scripts/start.sh . -cp sd-ui-files/scripts/open_dev_console.sh . +cp sd-ui-files/scripts/developer_console.sh . ./scripts/on_sd_start.sh diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 4481c384..090c8d18 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -5,7 +5,7 @@ @REM Caution, this file will make your eyes and brain bleed. It's such an unholy mess. @REM Note to self: Please rewrite this in Python. For the sake of your own sanity. -@copy "sd-ui-files\scripts\Open Developer Console.cmd" . /Y +@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y @call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index e9bc5980..b0bd9792 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -4,7 +4,7 @@ cp sd-ui-files/scripts/on_env_start.sh scripts/ source installer/etc/profile.d/conda.sh -cp sd-ui-files/scripts/open_dev_console.sh . +cp sd-ui-files/scripts/developer_console.sh . python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" From 06c8a004d840d341cf7fd2423330a28afc36257d Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 7 Oct 2022 19:52:31 +0530 Subject: [PATCH 2/2] Remove the old dev console scripts --- scripts/on_sd_start.bat | 1 + scripts/on_sd_start.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 520fe8d8..b857451a 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -6,6 +6,7 @@ @REM Note to self: Please rewrite this in Python. For the sake of your own sanity. @copy "sd-ui-files\scripts\Developer Console.cmd" . /Y +if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 6942aa93..8f5f7551 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -5,6 +5,9 @@ cp sd-ui-files/scripts/on_env_start.sh scripts/ source installer/etc/profile.d/conda.sh cp sd-ui-files/scripts/developer_console.sh . +if [ -e "open_dev_console.sh" ]; then + rm "open_dev_console.sh" +fi python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"