mirror of
https://github.com/markqvist/LXMF-Tools.git
synced 2025-01-07 05:28:09 -05:00
Fixed members count issue
This commit is contained in:
parent
d5e0d5449a
commit
c1c06aaa4e
31
build_git.sh
31
build_git.sh
@ -21,7 +21,7 @@ COMMENT_INIT="Initial commit"
|
||||
_prompt() {
|
||||
echo -e ""
|
||||
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
|
||||
case $opt in
|
||||
"Commit/Push"*)
|
||||
@ -30,6 +30,9 @@ _prompt() {
|
||||
"Clear History"*)
|
||||
_clear
|
||||
break;;
|
||||
"Init (Pull only)"*)
|
||||
_init_pull
|
||||
break;;
|
||||
"Init"*)
|
||||
_init
|
||||
break;;
|
||||
@ -120,7 +123,31 @@ _init() {
|
||||
git pull origin "${BRANCH}"
|
||||
|
||||
git commit -m "${VAR}"
|
||||
|
||||
|
||||
git push -f -u origin "${BRANCH}"
|
||||
}
|
||||
|
||||
|
||||
_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}"
|
||||
}
|
||||
|
||||
|
@ -2607,7 +2607,7 @@ def replace(text, source_hash, source_name, source_right, lng_key):
|
||||
|
||||
if delimiter+"count_members"+delimiter in text:
|
||||
count = 0
|
||||
for (section) in CONFIG.items("rights"):
|
||||
for (section, section_val) in CONFIG.items("rights"):
|
||||
if DATA.has_section(section):
|
||||
for (key, val) in DATA.items(section):
|
||||
count += 1
|
||||
|
Loading…
Reference in New Issue
Block a user