From ce773a2065d3900264466d2f146ea6f7e240507f Mon Sep 17 00:00:00 2001
From: Gianluca <gianluca.raberger@me.com>
Date: Mon, 11 Apr 2016 10:21:34 +0200
Subject: [PATCH] Adapted var names. old ones were missleading.

---
 cmd/utils/configuration.go |  8 ++++----
 cmd/utils/utils.go         | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cmd/utils/configuration.go b/cmd/utils/configuration.go
index 8df78ae0..e4b578f7 100644
--- a/cmd/utils/configuration.go
+++ b/cmd/utils/configuration.go
@@ -69,21 +69,21 @@ func (c *Configuration) ServerPath() string {
 
 // CertPath gets the path for certificates.
 func (c *Configuration) CertPath() string {
-    pathS, err := c.context.PersistentFlags().GetString("path")
+    pathStr, err := c.context.PersistentFlags().GetString("path")
     if err != nil {
         log.Fatalln(err.Error())
     }
-	return path.Join(pathS, "certificates")
+	return path.Join(pathStr, "certificates")
 }
 
 // AccountsPath returns the OS dependent path to the
 // local accounts for a specific CA
 func (c *Configuration) AccountsPath() string {
-    pathS, err := c.context.PersistentFlags().GetString("path")
+    pathStr, err := c.context.PersistentFlags().GetString("path")
     if err != nil {
         log.Fatalln(err.Error())
     }
-	return path.Join(pathS, "accounts", c.ServerPath())
+	return path.Join(pathStr, "accounts", c.ServerPath())
 }
 
 // AccountPath returns the OS dependent path to a particular account
diff --git a/cmd/utils/utils.go b/cmd/utils/utils.go
index 9bcea414..4bacbcbd 100644
--- a/cmd/utils/utils.go
+++ b/cmd/utils/utils.go
@@ -69,11 +69,11 @@ func SaveCertRes(certRes acme.CertificateResource, conf *Configuration) {
 }
 
 func Setup(c *cobra.Command) (*Configuration, *Account, *acme.Client) {
-	pathS, err := c.PersistentFlags().GetString("path")
+	pathStr, err := c.PersistentFlags().GetString("path")
 	if err != nil {
 		logger().Fatalf(err.Error())
 	}
-	err = CheckFolder(pathS)
+	err = CheckFolder(pathStr)
 	if err != nil {
 		logger().Fatalf("Could not check/create path: %s", err.Error())
 	}
@@ -106,21 +106,21 @@ func Setup(c *cobra.Command) (*Configuration, *Account, *acme.Client) {
 		logger().Fatalf("Could not create client: %s", err.Error())
 	}
 
-	excludeS, err := c.PersistentFlags().GetStringSlice("exclude")
+	excludeStr, err := c.PersistentFlags().GetStringSlice("exclude")
 	if err != nil {
 		logger().Fatal(err.Error())
 	}
-	if len(excludeS) > 0 {
+	if len(excludeStr) > 0 {
 		client.ExcludeChallenges(conf.ExcludedSolvers())
 	}
 
-	webrootS, err := c.PersistentFlags().GetString("webroot")
+	webrootStr, err := c.PersistentFlags().GetString("webroot")
 	if err != nil {
 		logger().Fatal(err.Error())
 	}
 
-	if len(webrootS) > 0 {
-		provider, err := webroot.NewHTTPProvider(webrootS)
+	if len(webrootStr) > 0 {
+		provider, err := webroot.NewHTTPProvider(webrootStr)
 		if err != nil {
 			logger().Fatal(err)
 		}
@@ -132,15 +132,15 @@ func Setup(c *cobra.Command) (*Configuration, *Account, *acme.Client) {
 		client.ExcludeChallenges([]acme.Challenge{acme.DNS01, acme.TLSSNI01})
 	}
 
-	httpS, err := c.PersistentFlags().GetString("http")
+	httpStr, err := c.PersistentFlags().GetString("http")
 	if err != nil {
 		logger().Fatal(err.Error())
 	}
-	if len(httpS) > 0 {
-		if strings.Index(httpS, ":") == -1 {
+	if len(httpStr) > 0 {
+		if strings.Index(httpStr, ":") == -1 {
 			logger().Fatalf("The --http switch only accepts interface:port or :port for its argument.")
 		}
-		client.SetHTTPAddress(httpS)
+		client.SetHTTPAddress(httpStr)
 	}
 
 	tls, err := c.PersistentFlags().GetString("tls")