GIT.Harvie.CZ
/
mirrors
/
Programs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
semestralka
[mirrors/Programs.git]
/
c
/
beermeter
/
beermeter.sh
diff --git
a/c/beermeter/beermeter.sh
b/c/beermeter/beermeter.sh
index 73fdaa88834fe6e1bec7917c31fbfc80f04470f1..9aa26dfd7f01e924168301e8d73b147056a26820 100755
(executable)
--- a/
c/beermeter/beermeter.sh
+++ b/
c/beermeter/beermeter.sh
@@
-11,6
+11,8
@@
backend='./audio.sh'
tmp="/tmp/beertmp-$$";
dialog=$(which dialog);
tmp="/tmp/beertmp-$$";
dialog=$(which dialog);
+#set +bm #job controll messages were messing up dialog's output!!!
+
rst() { echo -ne "\033[0;0H"; }
calc() {
rst() { echo -ne "\033[0;0H"; }
calc() {
@@
-36,11
+38,16
@@
beer_stat() {
add_account() {
"$dialog" --inputbox "New account name" 0 0 2>"$tmp"
add_account() {
"$dialog" --inputbox "New account name" 0 0 2>"$tmp"
- [ $? = 0 ] && touch "$accounts/$(cat "$tmp")";
+ stamgast=$(cat "$tmp")
+ [ $? = 0 ] && [ -n "$stamgast"] && touch "$accounts/$stamgast";
}
servis_menu() {
}
servis_menu() {
- $dialog --menu "$title servis" 0 0 0 new "Novy stamgast" exit "Konec party" 2>"$tmp"
+ $dialog --menu "$title servis" 0 0 0 \
+ tap "Seznam stamgastu" \
+ new "Novy stamgast" \
+ exit "Konec party" \
+ 2>"$tmp"
option="$(cat "$tmp")"
case $option in
option="$(cat "$tmp")"
case $option in
@@
-64,7
+71,7
@@
beer_menu() {
echo -n "$i"; echo -ne "\x00";
echo -n $(beer_stat "$i"); echo -ne "\x00"
echo -e "$i\t$(beer_stat "$i")" >> "$totals"
echo -n "$i"; echo -ne "\x00";
echo -n $(beer_stat "$i"); echo -ne "\x00"
echo -e "$i\t$(beer_stat "$i")" >> "$totals"
- done | xargs -0 $dialog --menu "$title stamgasti" 0 0 0
+ done | xargs -0 $dialog --menu "$title stamgasti" 0 0 0
2>"$1"
}
tap() {
}
tap() {
@@
-72,23
+79,28
@@
tap() {
pulses_start=$(beer_pulses "$stamgast")
clear
pulses_start=$(beer_pulses "$stamgast")
clear
- while true; do
+ "$backend" >> "$accounts/$stamgast" &
+ pid="$!"
+ while kill -0 "$pid" 2>/dev/null; do
+ #echo "$stamgast" > /tmp/testo
pulses_current=$(beer_pulses "$stamgast")
pulses_diff=$[ $pulses_current - $pulses_start ]
rst
pulses_current=$(beer_pulses "$stamgast")
pulses_diff=$[ $pulses_current - $pulses_start ]
rst
- echo == Cepuje stamgast
$stamgast, ukonci ctrl+c
==
+ echo == Cepuje stamgast
"$stamgast", ukonci stisknutim [ENTER]
==
echo "CURRE: $(beer_calc $pulses_diff) ";
echo "TOTAL: $(beer_calc $pulses_current) ";
echo "CURRE: $(beer_calc $pulses_diff) ";
echo "TOTAL: $(beer_calc $pulses_current) ";
- sleep 0.
5
;
+ sleep 0.
3
;
done &
done &
- "$backend" | tee -a "$accounts/$stamgast" >/dev/null
- kill $!
+ read -n 1
+ pkill -TERM -P "$pid" 2>/dev/null
+ kill -TERM "$pid" 2>/dev/null
+ (sleep 3; kill -KILL "$pid" 2>/dev/null) &
}
main_menu() {
while true; do
}
main_menu() {
while true; do
- beer_menu
2>
"$tmp"
+ beer_menu "$tmp"
[ "$?" = "0" ] && {
tap "$(cat "$tmp")"
true
[ "$?" = "0" ] && {
tap "$(cat "$tmp")"
true
This page took
0.24663 seconds
and
4
git commands to generate.