5c0f9c8 · searx · git.iko.soy

tooling box: varius fix from tests

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit5c0f9c8c79f8eca72c206e2f9bb7c6d26bf80fa4 authorMarkus Heiser <markus.heiser@darmarit.de> dateSat 8 Feb 2020, 17:12 (7 years ago) parentdb5815d

2 files changed+9−3

unifiedsplit

utils/filtron.sh+5

@@ -129,6 +129,11 @@ main() {

129129 case $2 in

130130 all) install_all ;;

131131 user) assert_user ;;

132+ rules)

133+ rst_title "Re-Install filtron rules"

134+ echo

135+ install_template --no-eval "$FILTRON_RULES" root root 644

136+ ;;

132137 *) usage "$_usage"; exit 42;;

133138 esac ;;

134139 update)

utils/searx.sh+4−3

@@ -224,12 +224,13 @@ update_searx() {

224224 rst_title "Update searx instance"

225225

226226 echo

227− tee_stderr 0.1 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix"

227+ tee_stderr 0.3 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix"

228228cd ${SEARX_SRC}

229229cp -f ${SEARX_SETTINGS} ${SEARX_SETTINGS}.backup

230230git stash push -m "BACKUP -- 'update server' at ($(date))"

231−git checkout -b $SEARX_GIT_BRANCH" --track "$SEARX_GIT_BRANCH"

232−git pull "$SEARX_GIT_BRANCH"

231+git checkout -B "$SEARX_GIT_BRANCH"

232+git pull

233+cd ${SEARX_SRC}

233234${SEARX_SRC}/manage.sh update_packages

234235EOF

235236 configure_searx