Upload 2 files

easydiffusion/_main.ipynb

@@ -18,17 +18,10 @@
     "\n",
     "if os.path.isfile(f\"{current_dir}/install_status.txt\") and \"sd_ui_git_cloned\" in open(f\"{current_dir}/install_status.txt\").read():\n",
     "    print(f\"Easy Diffusion's git repository was already installed. Updating from {update_branch}..\")\n",
-    "    os.chdir(\"sd-ui-files\")\n",
-    "    subprocess.run(\"git add -A .\", shell=True, capture_output=True, text=True)\n",
-    "    subprocess.run(\"git stash\", shell=True, capture_output=True, text=True)\n",
-    "    subprocess.run(\"git reset --hard\", shell=True, capture_output=True, text=True)\n",
-    "    subprocess.run(f\"git -c advice.detachedHead=false checkout {update_branch}\", shell=True, capture_output=True, text=True)\n",
-    "    subprocess.run(\"git pull\", shell=True, capture_output=True, text=True)\n",
-    "    os.chdir(\"..\")\n",
     "else:\n",
     "    print(\"\\nDownloading Easy Diffusion..\\n\")\n",
     "    print(f\"Using the {update_branch} channel\\n\")\n",
-    "    if subprocess.run(f\"git clone -b {update_branch} https://github.com/easydiffusion/easydiffusion.git sd-ui-files\", shell=True, capture_output=True, text=True).returncode == 0:\n",
+    "    if subprocess.run(f\"git clone -b {update_branch} https://github.com/Van-wise/easydiffusion sd-ui-files\", shell=True, capture_output=True, text=True).returncode == 0:\n",
     "        with open(f\"{current_dir}/sd-ui-files/scripts/install_status.txt\", \"a\") as status_file:\n",
     "            status_file.write(\"sd_ui_git_cloned\\n\")\n",
     "    else:\n",
@@ -57,24 +50,19 @@
     "\n",
     "fix_script()\n",
     "\n",
-    "def gen_key(path: Union[str, Path]) -> None:\n",
-    "    path = Path(path)\n",
-    "    arg_string = f'ssh-keygen -t rsa -b 4096 -N \"\" -q -f {path.as_posix()}'\n",
-    "    args = shlex.split(arg_string)\n",
-    "    subprocess.run(args, check=True)\n",
-    "    path.chmod(0o600)\n",
+    "def gen_key(path):\n",
+    "    arg_string = f'ssh-keygen -t rsa -b 4096 -N \"\" -q -f {path}'\n",
+    "    subprocess.run(arg_string, shell=True, check=True)\n",
+    "    os.chmod(path, 0o600)\n",
     "\n",
     "use_remote = True\n",
     "if use_remote:\n",
-    "  id_rsa_file = f\"{current_dir}/id_rsa\"\n",
-    "  id_rsa_pub_file = f\"{current_dir}/id_rsa.pub\"\n",
-    "  if os.path.exists(id_rsa_file):\n",
-    "      os.remove(id_rsa_file)\n",
-    "  if os.path.exists(id_rsa_pub_file):\n",
-    "      os.remove(id_rsa_pub_file)\n",
-    "  ssh_name = \"id_rsa\"\n",
-    "  ssh_path = Path(os.path.dirname(os.getcwd())) / ssh_name\n",
-    "  gen_key(ssh_path)\n",
+    "    id_rsa_file = \"/content/id_rsa\"\n",
+    "    id_rsa_pub_file = \"/content/id_rsa.pub\"\n",
+    "    for file in (id_rsa_file, id_rsa_pub_file):\n",
+    "        if os.path.exists(file):\n",
+    "            os.remove(file)\n",
+    "    gen_key(id_rsa_file)\n",
     "\n",
     "os.chdir(\"sd-ui-files\")\n",
     "\n",