fix @error2 on 6.2

Author: zhangzijie-pro

Cargo.lock

@@ -3,27 +3,6 @@
 欢迎使用 Tiks，一个简易的 Linux 终端命令行工具，类似于常见的 Linux 终端环境，提供了一系列常用的命令和功能。
 #### 供参考，若有错误改进地方可push到main
 
-## 环境变量
-
-如果想将其加入环境变量：
-
-```bash
-    Cargo build --release
-    cp | copy  ./target/release/tiks  $HOME/.Tiks/bin
-    或者下载 tiks / tiks.exe
-    添加至.Tiks目录下的bin中
-```
-
-- Windows:     执行./window/setup.bat    ->  setx PATH "%PATH%;%TIKS_DIR%\bin"
-- mac & Linux: 执行./mac_linux/setup.sh  ->  PATH=$PATH:/$HOME/.Tiks/bin   
-
-## 添加方法函数
-
-如果想向其中添加其余函数:
-
-- C\C++: [详见添加方法](./command/src/c_build/README.md)
-- rust: [详间rust添加方法](./command/src/commands/README.md)
-
 ## 功能特点
 
 - 提供常用的 Linux 命令，如 `pwd`, `ls`, `cd`, `rm`, `touch`, `cat`, `python` 等。
@@ -71,6 +50,17 @@ Commands:
 
 [点击此处下载 Rust 工具链](https://www.rust-lang.org/tools/install)
 
+## 添加方法函数
+
+如果想向其中添加其余函数:
+
+- C\C++: [详见添加方法](./command/src/c_build/README.md)
+- rust: [详间rust添加方法](./command/src/commands/README.md)
+
+## 环境变量
+[点击此查看](./command/src/env/README.md)
+
+
 ## 贡献
 
 如果你希望贡献代码或改进本项目，请先进行以下操作：

README.md

@@ -9,18 +9,15 @@
 
 use command::env::init_env;
 use command::run::init_shell;
-use command::start_logo::start_logo;
-use command::root::new_session;
+use command::start::start_logo::start_logo;
+use command::root::SESSION;
 
 fn main() {
         start_logo();
-        
-        // new user
-        let mut session_context = new_session();
 
         // set os envirment path in Tiks
         init_env();
 
         // init shell
-        init_shell(&mut session_context)
+        init_shell(&mut *SESSION.lock().unwrap())
 }

command/bin/main.rs

@@ -74,7 +74,7 @@ pub fn update(version: &str) -> std::io::Result<()>{
     let _release_linux = format!("https://github.com/zhangzijie-pro/Tiks/releases/download/{}/tiks",version);
     let _release_window = format!("https://github.com/zhangzijie-pro/Tiks/releases/download/{}/tiks.exe",version);
 
-    if cfg!(target_os = "linux") | cfg!(target_os="mac"){
+    if cfg!(target_os = "linux") | cfg!(target_os="macos"){
         let app_linux = get_linux_dir();
         task::block_on(async {
             update_to(&_release_linux, app_linux).await;
@@ -95,7 +95,7 @@ pub fn update(version: &str) -> std::io::Result<()>{
 pub async fn update_last() -> Result<(), Box<dyn std::error::Error>>{
     let client = Client::new();
 
-    if cfg!(target_os = "linux") | cfg!(target_os="mac"){
+    if cfg!(target_os = "linux") | cfg!(target_os="macos"){
         let response = client.get(_GITHUB_RELEASE_LINUX).send().await.expect("Error: update error");
         let app = get_linux_dir();
         let mut file = File::create(app).expect("Can't create file : tiks");

command/src/commands/apt.rs

@@ -1,7 +1,7 @@
 use crate::set::set::get_similar;
 use crate::root::{decryption, SessionContext};
 use crate::set::version;
-use crate::state_code::{missing_pattern, not_found};
+use crate::start::state_code::{missing_pattern, not_found};
 
 use super::code::*;
 use super::command::*;
@@ -68,6 +68,13 @@ impl Commands {
             arg,
         }
     }
+
+    pub fn from_string<T: Into<String>>(arg: T) -> Commands {
+        let arg_string = arg.into();
+        let commands: Vec<&str> = arg_string.split_whitespace().collect();
+        let commands_string: Vec<String> = commands.iter().map(|x| x.to_string()).collect();
+        Commands::new(commands_string)
+    }
 
 }
 

command/src/commands/arg.rs

@@ -1,6 +1,6 @@
 use std::process::Command;
 
-use crate::state_code::{run_code, run_code_er};
+use crate::start::state_code::{run_code, run_code_er};
 
 // run code use python ...
 pub fn python(file: Option<&str>) -> Result<(usize,String), std::io::Error> {

command/src/commands/code.rs

@@ -314,7 +314,7 @@ use crate::commands::apt::{download_package, find_package};
 use crate::priority::get_priority;
 use crate::set::set::file_create_time;
 use crate::run::run;
-use crate::state_code::{empty_dir, empty_file, env, missing_pattern, STATUE_CODE};
+use crate::start::state_code::{empty_dir, empty_file, env, missing_pattern, STATUE_CODE};
 use super::apt::{update, update_last};
 use crate::root::SessionContext;
 
@@ -538,16 +538,20 @@ pub fn pipe(command:Vec<String>) -> io::Result<(usize,String)>{
 }
 
 // &&
-pub fn and(command:Vec<String>,session_context: &mut SessionContext){
+pub fn and(command:Vec<String>,session_context: &mut SessionContext) -> Vec<String>{
+    let mut output:Vec<_> = Vec::new();
     let commands = command.split(|x| x=="&&");
     for c in commands{
         let v = c.to_vec();
-        run(v, session_context)
+        let r = run(v, session_context);
+        output.push(r)
     }
+    output
 }
 
 // &
-pub fn priority_run(command:Vec<String>,session_context: &mut SessionContext){
+pub fn priority_run(command:Vec<String>,session_context: &mut SessionContext) -> Vec<String>{
+    let mut output:Vec<_> = Vec::new();
     let commands = command.split(|x| x=="&");
     let mut save_command = Vec::new();
     for c in commands{
@@ -558,8 +562,10 @@ pub fn priority_run(command:Vec<String>,session_context: &mut SessionContext){
     save_command.sort_by_key(|c| -(get_priority(&c[0]).as_number() as i32));
 
     for c in save_command{
-        run(c, session_context)
+        let r = run(c, session_context);
+        output.push(r)
     }
+    output
 }
 
 fn get_env(id: String) -> String{