From e88edc6c9cb1cf1899601ef3dc8fc5876c60dfa3 Mon Sep 17 00:00:00 2001 From: echo <91651232+exhq@users.noreply.github.com> Date: Sun, 13 Nov 2022 21:17:35 +0330 Subject: [PATCH] fixed --distro and added nicer default colors --- utils/args.go | 8 ++++---- utils/printing.go | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/utils/args.go b/utils/args.go index 1df5bb0..e59230c 100644 --- a/utils/args.go +++ b/utils/args.go @@ -13,8 +13,8 @@ var usepng bool = false var hascolor bool = true var Customascii = false var asciidir string -var asciiforced = false -var forceddistro string +var Asciiforced = false +var Forceddistro string var Defaultconf bool = false var Defaultcolor bool = false var colorold bool = false @@ -32,8 +32,8 @@ func Initargs() { asciidir = strings.ReplaceAll(argument[8:], "~", "/home/"+Gethn()) } if strings.HasPrefix(argument, "--distro=") { - asciiforced = true - forceddistro = argument[9:] + Asciiforced = true + Forceddistro = argument[9:] } else if strings.HasPrefix(argument, "--") { switch argument { case "--nouwu": diff --git a/utils/printing.go b/utils/printing.go index 0eb5222..9cb7800 100644 --- a/utils/printing.go +++ b/utils/printing.go @@ -37,6 +37,7 @@ var isInProgressLine = false var logoLines []string var logoWidth int +var defaultcolor = "red 255 38 116 \ngreen 16 210 117\nblue 104 174 212\nwhite 250 253 255" var pngWidth = 12 var pngHeight = 12 var pngData []byte @@ -53,13 +54,13 @@ func Initcolor() { } if os.IsNotExist(existcolorconf) { f, _ := os.Create(colorconf) - _, _ = f.WriteString("red 255 0 0 \ngreen 0 255 0\nblue 0 0 255\nwhite 255 255 255") + _, _ = f.WriteString(defaultcolor) } c, _ := os.ReadFile(colorconf) content := string(c) if Defaultcolor { - content = "red 255 0 0 \ngreen 0 255 0\nblue 0 0 255\nwhite 255 255 255" + content = defaultcolor } lines := strings.Split(string(content), "\n") @@ -80,8 +81,8 @@ func Initcolor() { func CutePrintInit() { dist := data.GetDistroVariable("ID") logo := asciiarts.GetAscii(dist) - if asciiforced { - logo = asciiarts.GetAscii(forceddistro) + if Asciiforced { + logo = asciiarts.GetAscii(Forceddistro) } if noascii { logo = "" @@ -172,10 +173,10 @@ func parseFormat(format string) (parsedFormat Format) { } func getcustomizeddistro() string { - if !asciiforced { + if !Asciiforced { return data.GetDistroVariable("ID") } else { - return forceddistro + return Forceddistro } }