Add support for dereferencing command-line arguments

License: MIT
Signed-off-by: Dominic Della Valle <ddvpublic@gmail.com>

cli/parse.go

@@ -10,11 +10,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ipfs/go-ipfs-cmds"
-
 	osh "github.com/Kubuxu/go-os-helper"
 	"github.com/ipfs/go-ipfs-cmdkit"
 	"github.com/ipfs/go-ipfs-cmdkit/files"
+	"github.com/ipfs/go-ipfs-cmds"
 	logging "github.com/ipfs/go-log"
 )
 
@@ -79,6 +78,11 @@ func isRecursive(req *cmds.Request) bool {
 	return rec && ok
 }
 
+func resolveCommandLine(req *cmds.Request) bool {
+	linkOpt, ok := req.Options[cmds.DerefLong].(bool)
+	return linkOpt && ok
+}
+
 type parseState struct {
 	cmdline []string
 	i       int
@@ -265,6 +269,13 @@ func parseArgs(req *cmds.Request, root *cmds.Command, stdin *os.File) error {
 					fpath = stdin.Name()
 					file = files.NewReaderFile("", fpath, r, nil)
 				} else {
+					if resolveCommandLine(req) {
+						var err error
+						fpath, err = filepath.EvalSymlinks(fpath)
+						if err != nil {
+							return err
+						}
+					}
 					nf, err := appendFile(fpath, argDef, isRecursive(req), isHidden(req))
 					if err != nil {
 						return err

cli/parse_test.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"testing"

opts.go

@@ -14,10 +14,12 @@ const (
 	TimeoutOpt   = "timeout"
 	OptShortHelp = "h"
 	OptLongHelp  = "help"
+	DerefLong    = "dereference-command-line"
 )
 
 // options that are used by this package
 var OptionEncodingType = cmdkit.StringOption(EncLong, EncShort, "The encoding type the output should be encoded with (json, xml, or text)").WithDefault("text")
 var OptionRecursivePath = cmdkit.BoolOption(RecLong, RecShort, "Add directory paths recursively").WithDefault(false)
 var OptionStreamChannels = cmdkit.BoolOption(ChanOpt, "Stream channel output")
-var OptionTimeout = cmdkit.StringOption(TimeoutOpt, "set a global timeout on the command")
+var OptionTimeout = cmdkit.StringOption(TimeoutOpt, "Set a global timeout on the command")
+var OptionDerefArgs = cmdkit.BoolOption(DerefLong, "Resolve symlinks instead of adding them as-is").WithDefault(false)