From 20b63e9c85b92fbb2e95366446ec1f6a2569c840 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 19:21:50 +0300
Subject: [PATCH] - Added dconf load script, git post-merge hook and an empty
(for now) config.
---
.config/dconf.ini | 0
.githooks/post-merge | 2 ++
.pre-commit-config.yaml | 2 +-
Documents/bin/dconf-load | 10 ++++++++++
4 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 .config/dconf.ini
create mode 100755 Documents/bin/dconf-load
diff --git a/.config/dconf.ini b/.config/dconf.ini
new file mode 100644
index 0000000..e69de29
diff --git a/.githooks/post-merge b/.githooks/post-merge
index be076ab..0c26955 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -3,3 +3,5 @@ set -eu
cd "$(git rev-parse --show-toplevel)"
echo Generating SSH config
Documents/bin/gen-ssh-config
+echo Loading dconf config
+Documents/bin/dconf-load
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 358618c..fa995db 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,6 +9,6 @@
sha: v0.5.4
hooks:
- id: shell-lint
- files: &shellscripts 'bashrc|post-merge|profile|docker-|train-wifi|renew-certs|dma-clean|gen-ssh-config'
+ files: &shellscripts 'bashrc|post-merge|profile|docker-|train-wifi|renew-certs|dma-clean|gen-ssh-config|dconf-load'
- id: shellcheck
files: *shellscripts
diff --git a/Documents/bin/dconf-load b/Documents/bin/dconf-load
new file mode 100755
index 0000000..84b1cd1
--- /dev/null
+++ b/Documents/bin/dconf-load
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -eu
+
+if ! which dconf > /dev/null
+then
+ echo "Can't find dconf, exiting."
+ exit 0
+fi
+
+dconf-load < "$HOME/.config/dconf.ini"
--
GitLab