Merge pull request #118 from Sleitnick/data

Use new Data module
Sleitnick · Dec 30, 2019 · 7516cd0 · 7516cd0 · catgirlinspace · Jan 5, 2020
2 parents 7b8a6ca + 0032a93
commit 7516cd0
Show file tree

Hide file tree

Showing 11 changed files with 2,084 additions and 783 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 imgs/*.psd
 .luacheckrc
 node_modules/
-site/
+site/
diff --git a/build_filelist.py b/build_filelist.py
@@ -29,7 +29,8 @@ def find(ar, name):
 	print("Building file list...")
 
 	paths_data = []
-	all_files = check_output(["git", "ls-tree", "--name-only", "-r", "master", "src"])
+	cur_branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode("utf-8").strip()
+	all_files = check_output(["git", "ls-tree", "--name-only", "-r", cur_branch, "src"]).decode("utf-8")
 	paths = all_files.split("\n")
 	for path in paths:
 		path_array = path.split("/")