From e781ce149f893d791bf8cd535815451bba23cf5d Mon Sep 17 00:00:00 2001 From: bel Date: Sun, 22 Mar 2020 23:44:56 +0000 Subject: [PATCH] Make args a bit more sane --- main.go | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/main.go b/main.go index 6e00962..270f7dc 100755 --- a/main.go +++ b/main.go @@ -39,13 +39,16 @@ func main() { func config() lastn.Config { as := args.NewArgSet() - as.Append(args.INT, "n", "number of backups to retain", 5) - as.Append(args.STRING, "conf", "path to rclone conf", path.Join(os.Getenv("HOME"), "/.config/rclone/rclone.conf")) - as.Append(args.STRING, "root", "path to root", "./public") - as.Append(args.STRING, "ns", "ns for backups", path.Join("lastn", "dev")) - as.Append(args.STRING, "rclone", "rclone backend name", "blapointe-drive-enc") - as.Append(args.STRING, "store", "type of store, like [map rclone]", "map") as.Append(args.STRING, "cmd", "[backup, restore, list, clean]", "backup") + as.Append(args.INT, "n", "number of backups to retain", 5) + as.Append(args.STRING, "root", "path to root", "./public") + as.Append(args.STRING, "store", "type of store, like [map rclone]", "map") + as.Append(args.STRING, "storeaddr", "addr of store", "") + as.Append(args.STRING, "storeuser", "user of store", "") + as.Append(args.STRING, "storepass", "pass of store", "") + as.Append(args.STRING, "ns", "ns for backups", path.Join("lastn", "dev")) + as.Append(args.STRING, "rclone-conf", "path to rclone conf", path.Join(os.Getenv("HOME"), "/.config/rclone/rclone.conf")) + as.Append(args.STRING, "rclone-alias", "rclone backend name", "blapointe-drive-enc") if err := as.Parse(); err != nil { panic(err) } @@ -54,12 +57,15 @@ func config() lastn.Config { panic(err) } return lastn.Config{ - N: as.Get("n").GetInt(), - Conf: as.Get("conf").GetString(), - Rclone: as.Get("rclone").GetString(), - Root: root, - Ns: as.Get("ns").GetString(), - Store: as.Get("store").GetString(), - Cmd: as.Get("cmd").GetString(), + N: as.Get("n").GetInt(), + RcloneConf: as.Get("rclone-conf").GetString(), + RcloneAlias: as.Get("rclone-alias").GetString(), + Root: root, + Ns: as.Get("ns").GetString(), + Store: as.Get("store").GetString(), + StoreAddr: as.Get("storeaddr").GetString(), + StoreUser: as.Get("storeuser").GetString(), + StorePass: as.Get("storepass").GetString(), + Cmd: as.Get("cmd").GetString(), } }