From f842646d255a07eb6db6cd19c1c64a015f7952c5 Mon Sep 17 00:00:00 2001
From: Autoz <213220254@qq.com>
Date: Mon, 8 Jul 2024 15:14:30 +0800
Subject: [PATCH] v1.5.5 fix bugs and new theme

---
 .gitignore                           |   2 ++
 AutozShellLauncher.py                |  20 --------------------
 __pycache__/chatmode.cpython-310.pyc | Bin 2385 -> 2278 bytes
 ash.py                               |   2 ++
 chatmode.py                          |   8 +-------
 main.py                              |   2 +-
 theme/default/theme.py               |   8 ++++++--
 theme/sus/theme.py                   |  18 ++++++++++++++++++
 themetext                            |   2 +-
 9 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 AutozShellLauncher.py
 create mode 100644 ash.py
 create mode 100644 theme/sus/theme.py

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e2cae22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/dist/
diff --git a/AutozShellLauncher.py b/AutozShellLauncher.py
deleted file mode 100644
index 9b569af..0000000
--- a/AutozShellLauncher.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import os,sys
-
-if len(sys.argv) > 1:
-    try:
-        if not sys.argv[1] == "-c":
-            # 判断当前目录有没有main.py
-
-            os.system("pip install pluginbase")
-            if os.path.exists("main.py"):
-
-                os.system("python3 main.py")
-            else:
-                if os.path.exists("autozshell.zip"):
-                    os.system("unzip autozshell.zip")
-                    os.system("python3 main.py")
-    except:
-        pass
-
-    if sys.argv[1] == "-c":
-        os.system("zip autozshell.zip *")
diff --git a/__pycache__/chatmode.cpython-310.pyc b/__pycache__/chatmode.cpython-310.pyc
index 1ca455512e1f41b6cdf3da2e6e269989ead1826a..7b7884db52a8134d91cffaaf4351ca6700e9412d 100644
GIT binary patch
delta 586
zcmZ8eJxjw-6umc1wSJ_c4sEoxsjdC=qq_ME#7$5rMsRx9p@o!Iu(Svrf;cEx&ElBs
z4vMRSi<6V!Z?L1_C=T8vwTOX7&VA>;cg{Qab?SXGTvL=$;Lo`@JGc&ChGTeqSFB(s
zrpIZH5)?PlL|r3IM5|KcS*UuD&`vsl&|c<UP(jQv^T}9cJnP|k(o7Vws@&)iR7UI+
zvvGkZk_rwU_9!jpOhhoo2<(Nw9D=J*hAl%zmO$8rcA+nms7hUIB>O_zpo+0<(yu&w
zV5?%9q7e`iyyhdoCsNkAl;~tAONxn<^SU=lqe(kY83!wcBjCF?ervl(n!^U&``D)1
z#d^Nqtqi*Ny>71mb+gNQzMbp4PJ3FXuIrAU6$`ngYkOfp#{KL(ZjsrHpO%}FpNNr`
zftI@1y7~>qnB|>iS~+0B)(wJQ;+c$7npUagP7R^V@d?yRdnF^t|007XHi3dd^@Q*1
z24nE>BacG$UtO=|v-fX-u4FZbwsFmR8Tzt5hM(}-x(%%>a$sBvp^PDvFlv2=cJSc`
DT{)8Q

delta 721
zcmZ8eJ#W)c6us9ti3?4uk|8xolQfOny5SpKgai|8j38CG>QMFFRwR`}oI=!8RR)Wp
zn=6l%kS!r57KDVv1`~59r2GJW1YNk#b|Qo=>)rG2@jLIF`+M&E>P#n}zYP4W9h~fb
zn?0Q=<A=}977ig?h`_E8gjHT^R1O!#JXIpau2Y?BooaEtL=CEY=%H<pA+EI*_m?Qy
z8NzTm0))YB-US^*xvlu<W*L<jEu?6L3=c)6t-2Qkt*LO8`&EJOl%Wn0_Aba2H4hP-
zD}0f)aZ~mXq|635DzXg1OBl$$lv<1rw^FJ41XZ}Vl%V*E5bB~p^F<J|{56Wee;86+
zhvG1n`1g3qKZUJzyGhq6?;+iY585Jw=E9rQjIed<EwIDQF%H@J_?m1$_p$ppW#=bs
zH)b>bkF5+PeIVnIj+SGwv(!-%r9{%v%A{9ilmvT5ceuNnc#-*~Sv6FkyFMO%9B1Z~
zc;_D7-{s*Pen+q^9@#XR^kkhZIaP!Wj#i*;ZCXwyS^L-r%7{`d{IlzD4RL+WL(&u1
z-HvH~`E<!w3WMy?n;yBxgQ=r!AzbS9j)O<p=lCG-vwuu&j}G=bd#{|4Dp{i}<DI@3
q<x=h_=hEx_?HvkEazF5W@JxGH&{Pel75QqYqJ|2VgH!DVe*Fss*SV_z

diff --git a/ash.py b/ash.py
new file mode 100644
index 0000000..d0749ff
--- /dev/null
+++ b/ash.py
@@ -0,0 +1,2 @@
+import os
+os.system("python3 main.py")
\ No newline at end of file
diff --git a/chatmode.py b/chatmode.py
index ca4639e..03a1e4f 100644
--- a/chatmode.py
+++ b/chatmode.py
@@ -77,13 +77,7 @@ while True:
     with open(current_file_dir + "/" + "themetext", "r") as f:
         themetext = f.read()
 
-    # 获取当前用户和地址
-    user = os.getlogin()
-    address = os.getcwd()
-    # 把inputtext这个变量里的{user}换成user变量
-    inputtext = themetext.replace("{user}", user)
-    # 把inputtext这个变量里的{address}换成address变量
-    inputtext = inputtext.replace("{address}", address)
+    inputtext = themetext
 
     text1 = str(input(inputtext))
     if text1 == "exit":
diff --git a/main.py b/main.py
index 7d11ebf..4ea2100 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
 import configparser
 import sys,os
 import fun
-version = "1.5.0"
+version = "1.5.5"
 
 config = configparser.ConfigParser()
 if not os.path.exists(os.path.expanduser('~') + '/.ashrc'):
diff --git a/theme/default/theme.py b/theme/default/theme.py
index f7ba840..52fb61d 100644
--- a/theme/default/theme.py
+++ b/theme/default/theme.py
@@ -1,8 +1,12 @@
+import os
 theme_name = "default"
 theme_version = "1.0.0"
-head = "{user}@{address}$ "
 
-import os
+user = os.getlogin()
+address = os.getcwd()
+head = f"\033[31m{user}\033[0m@\033[32m{address}\033[0m$ "
+
+
 # 获取当前文件的绝对路径
 current_file_path = os.path.abspath(__file__)
 
diff --git a/theme/sus/theme.py b/theme/sus/theme.py
new file mode 100644
index 0000000..3c35e23
--- /dev/null
+++ b/theme/sus/theme.py
@@ -0,0 +1,18 @@
+import os
+theme_name = "sus"
+theme_version = "1.0.0"
+
+user = os.getlogin()
+address = os.getcwd()
+head = f"\033[31mSUS的{user}\033[0m@\033[32m{address}\033[0m$ "
+
+# 获取当前文件的绝对路径
+current_file_path = os.path.abspath(__file__)
+
+# 从绝对路径中提取目录
+current_file_dir = os.path.dirname(current_file_path)
+# 拼接成配置文件路径
+current_file_dir = current_file_dir.split("/")
+current_file_dir = "/".join(current_file_dir[:-1])
+with open(current_file_dir + "text", "w") as f:
+    f.write(head)
\ No newline at end of file
diff --git a/themetext b/themetext
index dd079d6..c0c0768 100644
--- a/themetext
+++ b/themetext
@@ -1 +1 @@
-{user}@{address}$ 
\ No newline at end of file
+root@/root/PycharmProjects/autozshell$ 
\ No newline at end of file