flynx/photobook
1
0
Fork 0
mirror of https://github.com/flynx/photobook.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed env/config overriding...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-03-11 11:51:25 +03:00
parent a40e2707c0
commit d6b026cd90
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/make-spreads.sh
View File

@ -134,26 +134,42 @@ shopt -s nullglob extglob
# load config... # load config...
CONFIG=${CONFIG:=$(basename ${0%.*}).cfg} CONFIG=${CONFIG:=$(basename ${0%.*}).cfg}
# prepend CFG_ to settings in config...
# NOTE: this is done to prevent them overriding the environment...
[ -e $CONFIG ] \ [ -e $CONFIG ] \
&& source "$CONFIG" && eval $(cat "$CONFIG" \
sed -e 's/^\(\s*\)\([A-Z_]\+=\)/\1CFG_\2/')
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# defaults... # defaults...
#
# NOTE: all of these options can be either set in the $CONFIG file or # NOTE: all of these options can be either set in the $CONFIG file or
# set in the script env. # set in the script env.
# NOTE: env takes priority over $CONFIG # NOTE: env takes priority over $CONFIG
# if set add pdf annotations of paths to each image... # if set add pdf annotations of paths to each image...
ANOTATE_IMAGE_PATHS=${ANOTATE_IMAGE_PATHS:=$CFG_ANOTATE_IMAGE_PATHS}
ANOTATE_IMAGE_PATHS=${ANOTATE_IMAGE_PATHS:=} ANOTATE_IMAGE_PATHS=${ANOTATE_IMAGE_PATHS:=}
# supported formats/extensions... # supported formats/extensions...
TEXT_FORMATS=${TEXT_FORMATS:=$CFG_TEXT_FORMATS}
TEXT_FORMATS=${TEXT_FORMATS:=txt} TEXT_FORMATS=${TEXT_FORMATS:=txt}
IMAGE_FORMATS=${IMAGE_FORMATS:=$CFG_IMAGE_FORMATS}
IMAGE_FORMATS=${IMAGE_FORMATS:=jpeg|jpg|png|pdf|svg|eps} IMAGE_FORMATS=${IMAGE_FORMATS:=jpeg|jpg|png|pdf|svg|eps}
SPREADS_DIR=${SPREADS_DIR:=$CFG_SPREADS_DIR}
SPREADS_DIR=${SPREADS_DIR:=spreads/} SPREADS_DIR=${SPREADS_DIR:=spreads/}
IMAGE_HIRES_DIR=${IMAGE_HIRES_DIR:=$CFG_IMAGE_HIRES_DIR}
IMAGE_HIRES_DIR=${IMAGE_HIRES_DIR:=} IMAGE_HIRES_DIR=${IMAGE_HIRES_DIR:=}
CAPTION_DIR=${CAPTION_DIR:=$CFG_CAPTION_DIR}
CAPTION_DIR=${CAPTION_DIR:=captions/} CAPTION_DIR=${CAPTION_DIR:=captions/}
TEMPLATE_DIR=${TEMPLATE_DIR:=$CFG_TEMPLATE_DIR}
TEMPLATE_DIR=${TEMPLATE_DIR:=templates/} TEMPLATE_DIR=${TEMPLATE_DIR:=templates/}
# Default templates # Default templates
@ -161,18 +177,30 @@ TEMPLATE_DIR=${TEMPLATE_DIR:=templates/}
# page components... # page components...
# page templates... # page templates...
EMPTY_PAGE=${EMPTY_PAGE:=$CFG_EMPTY_PAGE}
EMPTY_PAGE=${EMPTY_PAGE:=emptypage} EMPTY_PAGE=${EMPTY_PAGE:=emptypage}
TEXT_PAGE=${TEXT_PAGE:=$CFG_TEXT_PAGE}
TEXT_PAGE=${TEXT_PAGE:=textpage} TEXT_PAGE=${TEXT_PAGE:=textpage}
IMAGE_PAGE=${IMAGE_PAGE:=$CFG_IMAGE_PAGE}
IMAGE_PAGE=${IMAGE_PAGE:=imagepage} IMAGE_PAGE=${IMAGE_PAGE:=imagepage}
# dynamic spread templates... # dynamic spread templates...
# NOTE: the index here corresponds to the number of images found in a # NOTE: the index here corresponds to the number of images found in a
# spread directory... # spread directory...
if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then
IMAGE_SPREAD=( if ! [ ${#CFG_IMAGE_SPREAD[@]} = 0 ] ; then
[0]=text-spread IMAGE_SPREAD=()
[2]=image-image for i in ${!CFG_IMAGE_SPREAD[@]} ; do
) IMAGE_SPREAD[$i]=${CFG_IMAGE_SPREAD[$i]}
done
else
IMAGE_SPREAD=(
[0]=text-spread
[2]=image-image
)
fi
fi fi
@ -289,7 +317,7 @@ done
if [ -z $1 ] ; then if [ -z $1 ] ; then
SPREADS_DIR=pages/ SPREADS_DIR=spreads/
else else
SPREADS_DIR=$1/ SPREADS_DIR=$1/
fi fi