This commit is contained in:
KZacharski 2023-08-20 22:34:13 +02:00
parent dcec5f3b1c
commit 5b565b4803
1 changed files with 10 additions and 7 deletions

17
diji.go
View File

@ -43,8 +43,8 @@ func copy(src, dst string) (int64, error) {
} }
func main() { func main() {
var ver string = "1.1" var ver string = "1.2"
var version int = 2 var version int = 3
argsar := os.Args[1:] argsar := os.Args[1:]
var debugelement string = "-d" var debugelement string = "-d"
@ -84,9 +84,10 @@ func main() {
var creategitignore bool = true var creategitignore bool = true
var configlocation string var configlocation string
var configfile string
var exPath string var exPath string
if _, err := os.Stat("diji-config/config.txt"); err == nil { if _, err := os.Stat("diji-config"); err == nil {
configlocation = "diji-config/config.txt" configlocation = "diji-config"
} else if errors.Is(err, os.ErrNotExist) { } else if errors.Is(err, os.ErrNotExist) {
ex, err := os.Executable() ex, err := os.Executable()
@ -94,10 +95,11 @@ func main() {
panic(err) panic(err)
} }
exPath = filepath.Dir(ex) exPath = filepath.Dir(ex)
configlocation = exPath + "/diji-config/config.txt" configlocation = exPath + "/diji-config"
} }
configbytes, err := os.ReadFile(configlocation) configfile = configlocation + "/config.txt"
configbytes, err := os.ReadFile(configfile)
if err != nil { if err != nil {
fmt.Print(err) fmt.Print(err)
} }
@ -184,7 +186,7 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
var favpath string = assetspath + "/favicon.png" var favpath string = assetspath + "/favicon.png"
copy("diji-config/defaultfav.png", favpath) copy(configlocation+"/defaultfav.png", favpath)
fmt.Println(favpath + " created.") fmt.Println(favpath + " created.")
var indexcontent1 string = `<!DOCTYPE html> var indexcontent1 string = `<!DOCTYPE html>
<html lang="` + langstr + `"> <html lang="` + langstr + `">
@ -325,6 +327,7 @@ font-family: sans-serif;
fmt.Print("quickargument(bool): ") fmt.Print("quickargument(bool): ")
fmt.Println(quickargument) fmt.Println(quickargument)
fmt.Println("configlocation(string): " + configlocation) fmt.Println("configlocation(string): " + configlocation)
fmt.Println("configfile(string): " + configfile)
fmt.Println("exPath(string): " + exPath) fmt.Println("exPath(string): " + exPath)
fmt.Println("samplestr(string): " + samplestr) fmt.Println("samplestr(string): " + samplestr)
fmt.Println("langstr(string): " + langstr) fmt.Println("langstr(string): " + langstr)