From 6440e10122a7466fc2116b9346d52f698cc0db53 Mon Sep 17 00:00:00 2001 From: SebastianObi Date: Sun, 15 Oct 2023 08:48:26 +0200 Subject: [PATCH] lxmf_provisioning: Added name to the announcement --- build_git.sh | 15 ++++++++++++++- lxmf_provisioning/lxmf_provisioning.py | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/build_git.sh b/build_git.sh index 794d9e8..ac1543e 100755 --- a/build_git.sh +++ b/build_git.sh @@ -19,11 +19,19 @@ COMMENT_INIT="Initial commit" _prompt() { + echo -e "Origin: ${ORIGIN}" + echo -e "Branch: ${BRANCH}" + echo -e "Diff:" + git diff --numstat + echo -e "" echo -e "" echo -e "Select an option:" - options=("Commit/Push" "Clear History" "Init" "Init (Pull only)" "Init (Push only)" "Exit") + options=("Diff" "Commit/Push" "Clear History" "Init" "Init (Pull only)" "Init (Push only)" "Exit") select opt in "${options[@]}"; do case $opt in + "Diff"*) + _diff + break;; "Commit/Push"*) _commit break;; @@ -62,6 +70,11 @@ _define_files() { } +_diff() { + git diff +} + + _commit() { _define_files diff --git a/lxmf_provisioning/lxmf_provisioning.py b/lxmf_provisioning/lxmf_provisioning.py index 50da713..473ca76 100755 --- a/lxmf_provisioning/lxmf_provisioning.py +++ b/lxmf_provisioning/lxmf_provisioning.py @@ -1406,6 +1406,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False) announce_data[key][val[0]] = val_to_val(val[1]) else: announce_data[key] = val + announce_data["c"] = CONFIG["lxmf"]["display_name"].encode("utf-8") LXMF_CONNECTION = lxmf_connection( storage_path=path, @@ -1501,6 +1502,7 @@ DEFAULT_CONFIG_OVERRIDE = '''# This is the user configuration file to override t # This also has the advantage that all changed settings can be kept when updating the program. [lxmf] +display_name = LXMF Provisioning Server announce_periodic = Yes announce_periodic_interval = 15 #Minutes