support semicolon seperated command lines

weed/server/master_server.go

@@ -236,10 +236,19 @@ func (ms *MasterServer) startAdminScripts() {
 		for range c {
 			if ms.Topo.IsLeader() {
 				for _, line := range scriptLines {
+					for _, c := range strings.Split(line, ";") {
+						processEachCmd(reg, c, commandEnv)
+					}
+				}
+			}
+		}
+	}()
+}
 
+func processEachCmd(reg *regexp.Regexp, line string, commandEnv *shell.CommandEnv) {
 	cmds := reg.FindAllString(line, -1)
 	if len(cmds) == 0 {
-						continue
+		return
 	}
 	args := make([]string, len(cmds[1:]))
 	for i := range args {
@@ -256,10 +265,6 @@ func (ms *MasterServer) startAdminScripts() {
 		}
 	}
 }
-			}
-		}
-	}()
-}
 
 func (ms *MasterServer) createSequencer(option *MasterOption) sequence.Sequencer {
 	var seq sequence.Sequencer

weed/shell/shell_liner.go

@@ -45,9 +45,18 @@ func RunShell(options ShellOptions) {
 			return
 		}
 
+		for _, c := range strings.Split(cmd, ";") {
+			if processEachCmd(reg, c, commandEnv) {
+				return
+			}
+		}
+	}
+}
+
+func processEachCmd(reg *regexp.Regexp, cmd string, commandEnv *CommandEnv) bool {
 	cmds := reg.FindAllString(cmd, -1)
 	if len(cmds) == 0 {
-			continue
+		return false
 	} else {
 		line.AppendHistory(cmd)
 
@@ -61,7 +70,7 @@ func RunShell(options ShellOptions) {
 		if cmd == "help" || cmd == "?" {
 			printHelp(cmds)
 		} else if cmd == "exit" || cmd == "quit" {
-				return
+			return true
 		} else {
 			foundCommand := false
 			for _, c := range Commands {
@@ -78,7 +87,7 @@ func RunShell(options ShellOptions) {
 		}
 
 	}
-	}
+	return false
 }
 
 func printGenericHelp() {