Skip to content

Commit d7eeefa

Browse files
authored
Fix README example and docker_run to use --resourcedir correctly. (#276)
1 parent 3826b97 commit d7eeefa

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ Suppose you have a directory `my_resource_dir` with the following contents:
7373
- `reference_style.csl`
7474
- `template.tex`
7575

76-
`template.tex` and any input files can refer to files in `resource_dir`, for example
77-
by using `\includegraphics{extra/my_resource_dir/img/cover_page_background.png}`.
76+
`template.tex` and any input files can refer to files in `my_resource_dir`, for example
77+
by using `\includegraphics{img/cover_page_background.png}`.
7878

7979
You can then run the following:
8080

8181
```sh
8282
./docker_run \
83-
--extra_resource_dir path/to/my_resource_dir \
84-
--template extra/my_resource_dir/template.tex \
85-
--reference_doc extra/my_resource_dir/reference_doc.docx \
86-
--csl extra/my_resource_dir/reference_style.csl \
83+
--resourcedir my_resource_dir \
84+
--template /my_resource_dir/template.tex" \
85+
--reference_doc /my_resource_dir/reference_doc.docx" \
86+
--csl /my_resource_dir/reference_style.csl \
8787
--pdf output.pdf \
8888
input.tcg
8989
```
@@ -98,10 +98,10 @@ To render a document to HTML:
9898

9999
```sh
100100
./docker_run \
101-
--extra_resource_dir path/to/my_resource_dir \
102-
--template_html extra/my_resource_dir/html.template \
103-
--html_stylesheet extra/my_resource_dir/style1.css \
104-
--html_stylesheet extra/my_resource_dir/style2.css \
101+
--resourcedir my_resource_dir \
102+
--template_html /my_resource_dir/html.template \
103+
--html_stylesheet /my_resource_dir/style1.css \
104+
--html_stylesheet /my_resource_dir/style2.css \
105105
--html output.html \
106106
input.tcg
107107
```

docker_run

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ if test "${1}" == "--help"; then
2525
exit 0
2626
fi
2727

28-
EXTRA_RESOURCE_DIR=""
28+
RESOURCE_DIR=""
2929

3030
declare -a pass_through_args=()
3131

3232
while [[ $# -gt 0 ]]; do
3333
arg="$1"
3434
case "$arg" in
35-
--extra_resource_dir)
35+
--resourcedir)
3636
if [[ -n "$2" ]]; then
37-
EXTRA_RESOURCE_DIR="$2"
37+
RESOURCE_DIR="$2"
3838
shift 2
3939
else
4040
echo "Error: Argument for $1 is missing" >&2
@@ -51,9 +51,9 @@ done
5151

5252
declare -a docker_run_args=("--workdir=/workspace" "--volume=$(pwd):/workspace")
5353

54-
if [[ -n "${EXTRA_RESOURCE_DIR}" && -d "${EXTRA_RESOURCE_DIR}" ]]; then
55-
dir=$(basename "${EXTRA_RESOURCE_DIR}")
56-
docker_run_args+=("--volume=${EXTRA_RESOURCE_DIR}:/extra_resources/${dir}")
54+
if [[ -n "${RESOURCE_DIR}" && -d "${RESOURCE_DIR}" ]]; then
55+
docker_run_args+=("--volume=$(realpath ${RESOURCE_DIR}):/${RESOURCE_DIR}")
56+
docker_container_args+=("--resourcedir=/${RESOURCE_DIR}")
5757
fi
5858

5959
echo "Launching Container: ${docker_image}"

0 commit comments

Comments
 (0)