Skip to content

Commit aedb8b5

Browse files
environment functions logic fix (#91)
* moving isEnvExist closer to getEnv * isEnvExist and getEnv simplification Co-authored-by: Pedro Pessoa <pedro_santos_40@hotmail.com>
1 parent 8dfd18e commit aedb8b5

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/TibiaDataUtils.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,6 @@ func TibiaDataConvertEncodingtoUTF8(data io.Reader) io.Reader {
159159
return norm.NFKC.Reader(charmap.ISO8859_1.NewDecoder().Reader(data))
160160
}
161161

162-
// isEnvExist func - check if environment var is set
163-
func isEnvExist(key string) bool {
164-
if _, ok := os.LookupEnv(key); ok {
165-
return true
166-
}
167-
168-
return false
169-
}
170-
171162
// TibiaDataSanitizeEscapedString func - run unescape string on string
172163
func TibiaDataSanitizeEscapedString(data string) string {
173164
return html.UnescapeString(data)
@@ -183,9 +174,15 @@ func TibiaDataSanitizeNbspSpaceString(data string) string {
183174
return strings.ReplaceAll(data, "\u00A0", " ")
184175
}
185176

177+
// isEnvExist func - check if environment var is set
178+
func isEnvExist(key string) (ok bool) {
179+
_, ok = os.LookupEnv(key)
180+
return
181+
}
182+
186183
// getEnv func - read an environment or return a default value
187184
func getEnv(key string, defaultVal string) string {
188-
if value, exists := os.LookupEnv(key); exists {
185+
if value, exists := os.LookupEnv(key); exists && value != "" {
189186
return value
190187
}
191188

0 commit comments

Comments
 (0)