misc tweaks

Author: silverwind

.gitignore

@@ -95,7 +95,7 @@ cpu.out
 !/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
 /VERSION
 /.air
-/.licenses
+/.go-licenses
 
 # Snapcraft
 snap/.snapcraft/

Makefile

@@ -115,7 +115,7 @@ SVG_DEST_DIR := public/img/svg
 
 AIR_TMP_DIR := .air
 
-GO_LICENSE_TMP_DIR := .licenses
+GO_LICENSE_TMP_DIR := .go-licenses
 GO_LICENSE_FILE := assets/go-licenses.txt
 
 TAGS ?=

build/generate-go-licenses.js

@@ -22,8 +22,8 @@ async function main() {
   const str = glob(['**/*']).filter((path) => {
     return /\/((UN)?LICEN(S|C)E|COPYING|NOTICE)/i.test(path);
   }).sort().map((path) => {
-    const body = wrapAnsi(readFileSync(join(base, path), 'utf8') || '', 80);
     const name = dirname(path);
+    const body = wrapAnsi(readFileSync(join(base, path), 'utf8') || '', 80);
     return `${line}\n${name}\n${line}\n${body}`;
   }).join('\n');
   writeFileSync(out, str);