vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-02 04:50:49 +00:00
Code Issues Projects Releases Wiki Activity

Adding filename flag to specify task run filename.

Browse Source 
Just realised commands can not have any subcommands and therefore
consist of single words (for example serve or version). Hence I can't
assume that if len(args)==1 then the user has entered the filename.
I have created the filename flag so the user is forced to specify it
when they wish to run aptly tasks from files.
This commit is contained in:
Simon Aquino
2014-08-16 22:13:24 +00:00
parent b59471ad35
commit 91ff904ac4
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/task_run.go
+32 -31
View File
@@ -16,42 +16,17 @@ func aptlyTaskRun(cmd *commander.Command, args []string) error {
var err error
var cmd_list [][]string
if len(args) == 0 {
if filename := cmd.Flag.Lookup("filename").Value.Get().(string); filename != "" {
var text string
cmd_args := []string{}
fmt.Println("Please enter one command per line and leave one blank when finished.")
reader := bufio.NewReader(os.Stdin)
for {
fmt.Printf("> ")
text, _ = reader.ReadString('\n')
if text == "\n" {
break
} else {
text = strings.TrimSpace(text) + ","
parsed_args, _ := shellwords.Parse(text)
cmd_args = append(cmd_args, parsed_args...)
}
}
if len(cmd_args) == 0 {
return fmt.Errorf("Nothing entered. Exiting...\n")
}
cmd_list = formatCommands(cmd_args)
} else if len(args) == 1 {
var text string
cmd_args := []string{}
if finfo, err := os.Stat(args[0]); os.IsNotExist(err) || finfo.IsDir() {
return fmt.Errorf("No such file, %s\n", args[0])
if finfo, err := os.Stat(filename); os.IsNotExist(err) || finfo.IsDir() {
return fmt.Errorf("No such file, %s\n", filename)
}
fmt.Println("Reading file...\n")
file, err := os.Open(args[0])
file, err := os.Open(filename)
if err != nil {
return err
@@ -76,7 +51,32 @@ func aptlyTaskRun(cmd *commander.Command, args []string) error {
cmd_list = formatCommands(cmd_args)
} else if len(args) > 1 {
} else if len(args) == 0 {
var text string
cmd_args := []string{}
fmt.Println("Please enter one command per line and leave one blank when finished.")
reader := bufio.NewReader(os.Stdin)
for {
fmt.Printf("> ")
text, _ = reader.ReadString('\n')
if text == "\n" {
break
} else {
text = strings.TrimSpace(text) + ","
parsed_args, _ := shellwords.Parse(text)
cmd_args = append(cmd_args, parsed_args...)
}
}
if len(cmd_args) == 0 {
return fmt.Errorf("Nothing entered. Exiting...\n")
}
cmd_list = formatCommands(cmd_args)
} else {
cmd_list = formatCommands(args)
}
@@ -130,7 +130,7 @@ func formatCommands(args []string) [][]string {
func makeCmdTaskRun() *commander.Command {
cmd := &commander.Command{
Run: aptlyTaskRun,
UsageLine: "run <filename> | <command1>, <command2>, ...",
UsageLine: "run -filename=<filename> | <command1>, <command2>, ...",
Short: "run aptly tasks",
Long: `
Command helps origanise multiple aptly commands in one single aptly task, running as single thread.
@@ -147,5 +147,6 @@ Example:
`,
}
cmd.Flag.String("filename", "", "specifies the filename that contains the commands to run")
return cmd
}