From c44fbaccde3bcc36fe1ac9391af341d37b9b2dbf Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 28 Nov 2020 21:05:56 +0100 Subject: [PATCH] Put the database file in sharedstatedir. --- meson.build | 4 +++- update-plocate.sh | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 1d53e94..f916684 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,8 @@ project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std= add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp') add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp') -add_project_arguments('-DDBFILE="/var/lib/plocate/plocate.db"', language: 'cpp') +dbfile = join_paths(get_option('sharedstatedir'), 'plocate', 'plocate.db') +add_project_arguments('-DDBFILE="' + dbfile + '"', language: 'cpp') add_project_arguments('-DPACKAGE_NAME="plocate"', language: 'cpp') add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'cpp') add_project_arguments('-DPACKAGE_BUGREPORT="steinar+plocate@gunderson.no"', language: 'cpp') @@ -46,6 +47,7 @@ conf_data = configuration_data() conf_data.set('PROCESSED_BY_MESON', '1') conf_data.set('sbindir', join_paths(get_option('prefix'), get_option('sbindir'))) conf_data.set('locategroup', get_option('locategroup')) +conf_data.set('dbfile', dbfile) update_script = configure_file(input: 'update-plocate.sh', output: 'update-plocate.sh', configuration: conf_data) diff --git a/update-plocate.sh b/update-plocate.sh index 5d7b402..d113a14 100755 --- a/update-plocate.sh +++ b/update-plocate.sh @@ -5,11 +5,13 @@ set -e if [ @PROCESSED_BY_MESON@ = 1 ]; then SBINDIR=@sbindir@ LOCATEGROUP=@locategroup@ + DBFILE=@dbfile@ else SBINDIR=/usr/local/sbin LOCATEGROUP=plocate + DBFILE=/var/lib/plocate/plocate.db fi -$SBINDIR/plocate-build /var/lib/mlocate/mlocate.db /var/lib/plocate/plocate.db.new -chgrp $LOCATEGROUP /var/lib/plocate/plocate.db.new -mv /var/lib/plocate/plocate.db.new /var/lib/plocate/plocate.db +$SBINDIR/plocate-build /var/lib/mlocate/mlocate.db $DBFILE.new +chgrp $LOCATEGROUP $DBFILE.new +mv $DBFILE.new $DBFILE -- 2.39.2