From 21b6dc26da6b21f2f8fea9eb217d3d3d478d5fb7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 27 Oct 2018 15:03:16 +0100
Subject: [PATCH] Update searx packages during initial setup
---
src/freedombone-installer | 14 +++++++++++---
src/freedombone-utils-search | 2 --
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index ee7d25d97..43d3db697 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1167,9 +1167,17 @@ function after_setup_has_finished {
web_admin_create_add_apps
webadmin_update_version
- # new searx secret
- if [ -f "/etc/searx/searx/settings.yml" ]; then
- sed -i "s|secret_key :.*|secret_key : \"$(create_random_string 30)\"|g" "/etc/searx/searx/settings.yml"
+ if [ -d /etc/searx ]; then
+ # new searx secret
+ if [ -f "/etc/searx/searx/settings.yml" ]; then
+ sed -i "s|secret_key :.*|secret_key : \"$(create_random_string 30)\"|g" "/etc/searx/searx/settings.yml"
+ fi
+
+ # update searx
+ cd /etc/searx || return
+ ./manage.sh update_packages
+ chown -R searx:searx /etc/searx
+ systemctl restart searx
fi
# remove default user
diff --git a/src/freedombone-utils-search b/src/freedombone-utils-search
index fd9038683..cb04ca194 100755
--- a/src/freedombone-utils-search
+++ b/src/freedombone-utils-search
@@ -727,8 +727,6 @@ git checkout $SEARX_COMMIT -b $SEARX_COMMIT
useradd -d ${SEARX_PATH}/searx/ -s /bin/false searx
adduser searx debian-tor
-
-./manage.sh update_packages
EOF
if [ ! -f "$rootdir/usr/bin/install_searx" ]; then
echo "$rootdir/usr/bin/install_searx not found"
--
GitLab