feat(folders): move template out of base and add lang folder

chujimmy · Jun 11, 2021 · 4332efe · 4332efe
1 parent 42c2f57
commit 4332efe
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/generate-cv.yml b/.github/workflows/generate-cv.yml
@@ -31,7 +31,7 @@ jobs:
         run: >
           FILE_PATTERN=${{ steps.output_set.outputs.file_pattern}} &&
           counter=0 &&
-          while [[ $(find . -regextype sed -regex ".*/[a-z]\{2\}/cv.tex" | wc -l ) -gt $(find . -name "$FILE_PATTERN.pdf" | wc -l ) && $counter -le 60 ]]; do
+          while [[ $(find . -regextype sed -regex ".*/lang/[a-z]\{2\}/cv.tex" | wc -l ) -gt $(find . -name "$FILE_PATTERN.pdf" | wc -l ) && $counter -le 60 ]]; do
             echo "Waiting for pdf files to be generated..."
             ((counter++))
             sleep 1

diff --git a/Makefile b/Makefile
@@ -33,8 +33,8 @@ LANG_LOWER = $(shell echo $(LANG) | tr A-Z a-z)
 .PHONY: add-cv
 add-cv: 
 	$(call check_lang)
-	mkdir ./src/cv/$(LANG_LOWER)/
-	cp -a ./src/cv/base/. ./src/cv/$(LANG_LOWER)/
+	mkdir ./src/cv/lang/$(LANG_LOWER)/
+	cp -a ./src/template/cv/. ./src/cv/lang/$(LANG_LOWER)/
 
 .PHONY: remove-cv
 remove-cv: 

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-find . -regextype sed -regex ".*/[a-z]\{2\}/cv.tex" | while read fname; do
+find . -regextype sed -regex ".*/cv/lang/[a-z]\{2\}/cv.tex" | while read fname; do
   latexmk -C -cd $fname
   # Could use -interaction=batchmode which seems intended for automated scripts?
   latexmk -pdf -pvc -file-line-error -view=none -interaction=nonstopmode -recorder -cd $fname > /proc/1/fd/1 2>/proc/1/fd/2 &

diff --git a/src/cv/base/sections/00_header.tex b/src/cv/base/sections/00_header.tex
diff --git a/src/cv/common/main.tex b/src/cv/common/main.tex
@@ -5,6 +5,6 @@
 \usepackage{xpatch}
 \usepackage{xstring}
 
-\input{../common/moderncv_override}
-\input{../common/spacing}
-\input{../common/style}
+\input{../../common/moderncv_override}
+\input{../../common/spacing}
+\input{../../common/style}
diff --git a/src/cv/base/cv.tex → src/cv/lang/en/cv.tex b/src/cv/base/cv.tex → src/cv/lang/en/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../common/main}
+\input{../../common/main}
 \input{./sections/00_header}
 
 \nopagenumbers

diff --git a/src/cv/en/sections/00_header.tex → src/cv/lang/en/sections/00_header.tex b/src/cv/en/sections/00_header.tex → src/cv/lang/en/sections/00_header.tex
@@ -1,4 +1,4 @@
-\input{../common/sections/header}
+\input{../../common/sections/header}
 \extrainfo{
   \begin{tabular}[t]{@{}r@{}}
     Date of birth: 01/01/1970 \\

diff --git a/...n/sections/10_professional_experience.tex → ...n/sections/10_professional_experience.tex b/...n/sections/10_professional_experience.tex → ...n/sections/10_professional_experience.tex
diff --git a/src/cv/en/sections/20_education.tex → src/cv/lang/en/sections/20_education.tex b/src/cv/en/sections/20_education.tex → src/cv/lang/en/sections/20_education.tex
diff --git a/src/cv/en/sections/30_miscellaneous.tex → src/cv/lang/en/sections/30_miscellaneous.tex b/src/cv/en/sections/30_miscellaneous.tex → src/cv/lang/en/sections/30_miscellaneous.tex
diff --git a/src/cv/fr/cv.tex → src/cv/lang/fr/cv.tex b/src/cv/fr/cv.tex → src/cv/lang/fr/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../common/main}
+\input{../../common/main}
 \input{./sections/00_header}
 
 \nopagenumbers

diff --git a/src/cv/fr/sections/00_header.tex → src/cv/lang/fr/sections/00_header.tex b/src/cv/fr/sections/00_header.tex → src/cv/lang/fr/sections/00_header.tex
@@ -1,4 +1,4 @@
-\input{../common/sections/header}
+\input{../../common/sections/header}
 \extrainfo{
   \begin{tabular}[t]{@{}r@{}}
     Date~de~naissance~:~01/01/1970 \\

diff --git a/...r/sections/10_professional_experience.tex → ...r/sections/10_professional_experience.tex b/...r/sections/10_professional_experience.tex → ...r/sections/10_professional_experience.tex
diff --git a/src/cv/fr/sections/20_education.tex → src/cv/lang/fr/sections/20_education.tex b/src/cv/fr/sections/20_education.tex → src/cv/lang/fr/sections/20_education.tex
diff --git a/src/cv/fr/sections/30_miscellaneous.tex → src/cv/lang/fr/sections/30_miscellaneous.tex b/src/cv/fr/sections/30_miscellaneous.tex → src/cv/lang/fr/sections/30_miscellaneous.tex
diff --git a/src/cv/en/cv.tex → src/template/cv/cv.tex b/src/cv/en/cv.tex → src/template/cv/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../common/main}
+\input{../../common/main}
 \input{./sections/00_header}
 
 \nopagenumbers

diff --git a/src/template/cv/sections/00_header.tex b/src/template/cv/sections/00_header.tex
@@ -0,0 +1,2 @@
+\input{../../common/sections/header}
+\extrainfo{}
diff --git a/...e/sections/10_professional_experience.tex → ...v/sections/10_professional_experience.tex b/...e/sections/10_professional_experience.tex → ...v/sections/10_professional_experience.tex
diff --git a/src/cv/base/sections/20_education.tex → src/template/cv/sections/20_education.tex b/src/cv/base/sections/20_education.tex → src/template/cv/sections/20_education.tex
diff --git a/src/cv/base/sections/30_miscellaneous.tex → ...template/cv/sections/30_miscellaneous.tex b/src/cv/base/sections/30_miscellaneous.tex → ...template/cv/sections/30_miscellaneous.tex
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		\input{../../common/sections/header}
		\extrainfo{}