zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #266 from return42/fix-scripts 

[fix] utils/searx.sh install settings - do not eval the template
This commit is contained in:
Markus Heiser 2021-08-22 16:07:37 +00:00 committed by GitHub
parent 29b40338d6 8ba4dc26d1
commit 183c856396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/filtron.sh
View File

@ -302,6 +302,12 @@ install_rules() {
return return
fi fi
if cmp --silent "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"; then
info_msg "${FILTRON_RULES} is up to date with"
info_msg "${FILTRON_RULES_TEMPLATE}"
return
fi
rst_para "Diff between origin's rules file (+) and current (-):" rst_para "Diff between origin's rules file (+) and current (-):"
echo "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}" echo "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"
$DIFF_CMD "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}" $DIFF_CMD "${FILTRON_RULES}" "${FILTRON_RULES_TEMPLATE}"

3
utils/lib.sh
View File

@ -437,7 +437,8 @@ install_template() {
if [[ "$do_eval" == "1" ]]; then if [[ "$do_eval" == "1" ]]; then
template_file="${CACHE}${dst}${variant}" template_file="${CACHE}${dst}${variant}"
info_msg "BUILD template ${template_file}" info_msg "BUILD ${template_file}"
info_msg "BUILD using template ${template_origin}"
if [[ -n ${SUDO_USER} ]]; then if [[ -n ${SUDO_USER} ]]; then
sudo -u "${SUDO_USER}" mkdir -p "$(dirname "${template_file}")" sudo -u "${SUDO_USER}" mkdir -p "$(dirname "${template_file}")"
else else

2
utils/searx.sh
View File

@ -621,7 +621,7 @@ install_settings() {
fi fi
mkdir -p "$(dirname "${SEARX_SETTINGS_PATH}")" mkdir -p "$(dirname "${SEARX_SETTINGS_PATH}")"
install_template \ install_template --no-eval \
"${SEARX_SETTINGS_PATH}" \ "${SEARX_SETTINGS_PATH}" \
"${SERVICE_USER}" "${SERVICE_GROUP}" "${SERVICE_USER}" "${SERVICE_GROUP}"
configure_searx configure_searx