Add new migration to fix broken gsettings

This will undo the non-upstream patch we had for appfolders, and
ensure we reset to the new schema upon login, whereby dconf will
have sourced the user db.

Signed-off-by: Ikey Doherty <ikey.doherty@intel.com>
This commit is contained in:
Ikey Doherty
2019-01-14 13:33:36 +00:00
parent e1ff1d058c
commit bffed0e80f
3 changed files with 57 additions and 1 deletions
+32
View File
@@ -0,0 +1,32 @@
#!/bin/bash
#
# Copyright (c) 2019 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
# We need to manually reset the dconf schema for app-folders due to a non
# upstreamed script, to ensure the new app-folders defaults are put in place.
if [[ -e "$HOME/.clr-migrate-settings" ]]; then
exit 0
fi
dconf reset -f /org/gnome/desktop/app-folders/
touch "$HOME/.clr-migrate-settings"
+9
View File
@@ -0,0 +1,9 @@
[Desktop Entry]
Name=Migrate dconf settings
Comment=Migrate dconf settings
Exec=@prefix@/libexec/clr-migrate-settings
Terminal=false
Type=Application
Categories=
NoDisplay=true
OnlyShowIn=GNOME;
+16 -1
View File
@@ -16,6 +16,7 @@ libexecdir = join_paths(prefix, get_option('libexecdir'))
desktop_conf = configuration_data()
desktop_conf.set('prefix', prefix)
# Flathub
configure_file(
input: 'org.clearlinux.initFlathubRepo.desktop.in',
output: 'org.clearlinux.initFlathubRepo.desktop',
@@ -23,6 +24,12 @@ configure_file(
install_dir: join_paths(xdgdir, 'autostart')
)
install_data(
'clr-init-flathub-repo',
install_dir : libexecdir
)
# XFCE Desktop files
configure_file(
input: 'clr-desktop-files.desktop.in',
output: 'clr-desktop-files.desktop',
@@ -35,8 +42,16 @@ install_data(
install_dir : bindir
)
# Reset old dconf schemas to ensure new app-folders take
configure_file(
input: 'clr-migrate-settings.desktop.in',
output: 'clr-migrate-settings.desktop',
configuration: desktop_conf,
install_dir: join_paths(xdgdir, 'autostart')
)
install_data(
'clr-init-flathub-repo',
'clr-migrate-settings',
install_dir : libexecdir
)