Git-Mirrors/LXMF-Tools
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF-Tools.git synced 2025-01-08 22:18:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed members count issue

Browse Source
This commit is contained in:
SebastianObi 2022-10-23 19:26:06 +02:00
parent d5e0d5449a
commit c1c06aaa4e
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build_git.sh
View File

@ -21,7 +21,7 @@ COMMENT_INIT="Initial commit"
_prompt() { _prompt() {
echo -e "" echo -e ""
echo -e "Select an option:" echo -e "Select an option:"
options=("Commit/Push" "Clear History" "Init" "Exit") options=("Commit/Push" "Clear History" "Init" "Init (Pull only)" "Exit")
select opt in "${options[@]}"; do select opt in "${options[@]}"; do
case $opt in case $opt in
"Commit/Push"*) "Commit/Push"*)
@ -30,6 +30,9 @@ _prompt() {
"Clear History"*) "Clear History"*)
_clear _clear
break;; break;;
"Init (Pull only)"*)
_init_pull
break;;
"Init"*) "Init"*)
_init _init
break;; break;;
@ -125,6 +128,30 @@ _init() {
} }
_init_pull() {
echo -e ""
echo -e "Init (Pull only)"
read VAR
if [ -z "${VAR}" ]; then
VAR="${COMMENT_INIT}"
fi
rm -rf .git
git init
_define_files
git branch -M "${BRANCH}"
git remote add origin "${ORIGIN}"
git pull origin "${BRANCH}"
git push -f -u origin "${BRANCH}"
}
############################################################################################################## ##############################################################################################################
# Setup/Start # Setup/Start

2
lxmf_distribution_group/lxmf_distribution_group.py
View File

@ -2607,7 +2607,7 @@ def replace(text, source_hash, source_name, source_right, lng_key):
if delimiter+"count_members"+delimiter in text: if delimiter+"count_members"+delimiter in text:
count = 0 count = 0
for (section) in CONFIG.items("rights"): for (section, section_val) in CONFIG.items("rights"):
if DATA.has_section(section): if DATA.has_section(section):
for (key, val) in DATA.items(section): for (key, val) in DATA.items(section):
count += 1 count += 1