tooling box: varius fix from tests

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

2 files changed, 9 insertions, 3 deletions

diff --git a/utils/filtron.sh b/utils/filtron.sh
index e97b9f014..1bea7a717 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -129,6 +129,11 @@ main() {
             case $2 in
                 all) install_all ;;
                 user) assert_user ;;
+                rules)
+                    rst_title "Re-Install filtron rules"
+                    echo
+                    install_template --no-eval "$FILTRON_RULES" root root 644
+                    ;;
                 *) usage "$_usage"; exit 42;;
             esac ;;
         update)
diff --git a/utils/searx.sh b/utils/searx.sh
index f02066ea0..5eb16700b 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -224,12 +224,13 @@ update_searx() {
     rst_title "Update searx instance"
 
     echo
-    tee_stderr 0.1 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 |  prefix_stdout "$_service_prefix"
+    tee_stderr 0.3 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 |  prefix_stdout "$_service_prefix"
 cd ${SEARX_SRC}
 cp -f ${SEARX_SETTINGS} ${SEARX_SETTINGS}.backup
 git stash push -m "BACKUP -- 'update server' at ($(date))"
-git checkout -b $SEARX_GIT_BRANCH" --track "$SEARX_GIT_BRANCH"
-git pull "$SEARX_GIT_BRANCH"
+git checkout -B "$SEARX_GIT_BRANCH"
+git pull
+cd ${SEARX_SRC}
 ${SEARX_SRC}/manage.sh update_packages
 EOF
     configure_searx