Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c0f9c8c authored by Markus Heiser's avatar Markus Heiser
Browse files

tooling box: varius fix from tests

parent db5815d3
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,11 @@ main() {
            case $2 in
            case $2 in
                all) install_all ;;
                all) install_all ;;
                user) assert_user ;;
                user) assert_user ;;
                rules)
                    rst_title "Re-Install filtron rules"
                    echo
                    install_template --no-eval "$FILTRON_RULES" root root 644
                    ;;
                *) usage "$_usage"; exit 42;;
                *) usage "$_usage"; exit 42;;
            esac ;;
            esac ;;
        update)
        update)
+4 −3
Original line number Original line Diff line number Diff line
@@ -224,12 +224,13 @@ update_searx() {
    rst_title "Update searx instance"
    rst_title "Update searx instance"


    echo
    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}
cd ${SEARX_SRC}
cp -f ${SEARX_SETTINGS} ${SEARX_SETTINGS}.backup
cp -f ${SEARX_SETTINGS} ${SEARX_SETTINGS}.backup
git stash push -m "BACKUP -- 'update server' at ($(date))"
git stash push -m "BACKUP -- 'update server' at ($(date))"
git checkout -b $SEARX_GIT_BRANCH" --track "$SEARX_GIT_BRANCH"
git checkout -B "$SEARX_GIT_BRANCH"
git pull "$SEARX_GIT_BRANCH"
git pull
cd ${SEARX_SRC}
${SEARX_SRC}/manage.sh update_packages
${SEARX_SRC}/manage.sh update_packages
EOF
EOF
    configure_searx
    configure_searx