diff --git a/diji-config/config.txt b/diji-config/config.txt
index a7270d1..a4d2aea 100644
--- a/diji-config/config.txt
+++ b/diji-config/config.txt
@@ -2,4 +2,7 @@
quick-mode = false
// Debug mode - prints all variables at the end of a run.
-debug = false
\ No newline at end of file
+debug = false
+
+// Should a favicon be added by default
+favicon = true
\ No newline at end of file
diff --git a/diji.go b/diji.go
index 873b217..24ff6ce 100644
--- a/diji.go
+++ b/diji.go
@@ -43,16 +43,18 @@ func copy(src, dst string) (int64, error) {
}
func main() {
- var ver string = "1.2"
- var version int = 3
+ var ver string = "1.3"
+ var version int = 4
argsar := os.Args[1:]
var debugelement string = "-d"
var quickelement string = "-q"
var buildelement string = "--buildversion"
+ var addfavelement string = "-f"
var debugargument bool = false
var quickargument bool = false
var buildargument bool = false
+ var addfavargument bool = false
for i := 0; i < len(argsar); i++ {
// checking if the array contains the given value
@@ -81,6 +83,15 @@ func main() {
}
}
+ for i := 0; i < len(argsar); i++ {
+ // checking if the array contains the given value
+ if argsar[i] == addfavelement {
+ // changing the boolean variable
+ addfavargument = true
+ break
+ }
+ }
+
if buildargument == true {
fmt.Print(ver)
os.Exit(0)
@@ -122,6 +133,7 @@ func main() {
configtext := string(configbytes)
var quickmode bool = strings.Contains(configtext, "quick-mode = true")
var debug bool = strings.Contains(configtext, "debug = true")
+ var addfav bool = strings.Contains(configtext, "favicon = true")
if debugargument == true {
if debug == true {
@@ -139,6 +151,14 @@ func main() {
}
}
+ if addfavargument == true {
+ if addfav == true {
+ addfav = false
+ } else if addfav == false {
+ addfav = true
+ }
+ }
+
var cssstr string
var jsstr string
var samplestr string
@@ -197,13 +217,17 @@ func main() {
if err != nil {
log.Fatal(err)
}
- var assetspath string = projname + "/assets"
- if err := os.Mkdir(assetspath, os.ModePerm); err != nil {
- log.Fatal(err)
+
+ if addfav == true {
+ var assetspath string = projname + "/assets"
+ if err := os.Mkdir(assetspath, os.ModePerm); err != nil {
+ log.Fatal(err)
+ }
+ var favpath string = assetspath + "/favicon.png"
+ copy(configlocation+"/defaultfav.png", favpath)
+ fmt.Println(favpath + " created.")
}
- var favpath string = assetspath + "/favicon.png"
- copy(configlocation+"/defaultfav.png", favpath)
- fmt.Println(favpath + " created.")
+
var indexcontent1 string = `
@@ -211,7 +235,6 @@ func main() {
` + projname + `
-
`
var csstag string = `
`
@@ -230,6 +253,11 @@ func main() {
` + samplecontent + `
`
}
+ var favtag string = `
+`
+ if addfav == true {
+ indexcontent1 = indexcontent1 + favtag
+ }
if createcss == true {
indexcontent1 = indexcontent1 + csstag
}
@@ -324,8 +352,8 @@ font-family: sans-serif;
fmt.Println("cssstr(string): " + cssstr)
fmt.Println("jsstr(string): " + jsstr)
fmt.Println("indname(string): " + indname)
- fmt.Println("assetspath(string): " + assetspath)
- fmt.Println("favpath(string): " + favpath)
+ //fmt.Println("assetspath(string): " + assetspath)
+ // fmt.Println("favpath(string): " + favpath)
fmt.Println("indexcontent1(string): " + indexcontent1)
fmt.Println("csstag(string): " + csstag)
fmt.Println("jstag(string): " + jstag)