X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dc021c3b57dcdebe464c148d55f9990a74e8246b..10440ac12d6771ab80469adf551d2cac8d3461e6:/tools/keep-rsync/keep-rsync.go

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index 6926a945e1..7e519f775b 100644
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 	"git.arvados.org/arvados.git/sdk/go/keepclient"
 )
@@ -76,12 +77,10 @@ func doMain() error {
 		false,
 		"Print version information and exit.")
 
-	// Parse args; omit the first arg which is the command name
-	flags.Parse(os.Args[1:])
-
-	// Print version information if requested
-	if *getVersion {
-		fmt.Printf("keep-rsync %s\n", version)
+	if ok, code := cmd.ParseFlags(flags, os.Args[0], os.Args[1:], "", os.Stderr); !ok {
+		os.Exit(code)
+	} else if *getVersion {
+		fmt.Printf("%s %s\n", os.Args[0], version)
 		os.Exit(0)
 	}
 
@@ -119,7 +118,6 @@ type apiConfig struct {
 	APIToken        string
 	APIHost         string
 	APIHostInsecure bool
-	ExternalClient  bool
 }
 
 // Load src and dst config from given files
@@ -165,8 +163,6 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin
 			config.APIHost = value
 		case "ARVADOS_API_HOST_INSECURE":
 			config.APIHostInsecure = arvadosclient.StringBool(value)
-		case "ARVADOS_EXTERNAL_CLIENT":
-			config.ExternalClient = arvadosclient.StringBool(value)
 		case "ARVADOS_BLOB_SIGNING_KEY":
 			blobSigningKey = value
 		}
@@ -182,7 +178,6 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
 		ApiInsecure: config.APIHostInsecure,
 		Client: &http.Client{Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: config.APIHostInsecure}}},
-		External: config.ExternalClient,
 	}
 
 	// If keepServicesJSON is provided, use it instead of service discovery