pali112
/
fla.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less echo cmd calls, same output

This commit is contained in:
Bryan Jenks 2020-05-09 05:31:26 -07:00
parent 1ba3b21993
commit d73faea243
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flash
View File

@ -221,16 +221,16 @@ main(){
# shellcheck disable=SC2162 # shellcheck disable=SC2162
read -a q <<< "$(sort "$DECK" -n --field-separator=: --key=4 | head -n "$CARD_POOL_SIZE"| shuf -n 1)" read -a q <<< "$(sort "$DECK" -n --field-separator=: --key=4 | head -n "$CARD_POOL_SIZE"| shuf -n 1)"
clear clear
echo -e "${WHITEBG} Fla.sh - Flash Cards In Your Terminal ${NC}" echo -e "${WHITEBG} Fla.sh - Flash Cards In Your Terminal ${NC}
echo -e "${ORANGE}${BOLD}Cards Reviewed:${BOLD}${NC}\t$COUNTER" ${ORANGE}${BOLD}Cards Reviewed:${BOLD}${NC}\t$COUNTER
echo -e "\t${ORANGE}${BOLD}High Score:${BOLD}${NC}\t$(cat "$HIGH_SCORE")" \t${ORANGE}${BOLD}High Score:${BOLD}${NC}\t$(cat "$HIGH_SCORE")
echo -e "\t${ORANGE}${BOLD}Avg review:${BOLD}${NC}\t$(awk '{ sum += $7; n++ } END { if (n > 0) print sum / n; }' "$REVIEW_LOG")" \t${ORANGE}${BOLD}Avg review:${BOLD}${NC}\t$(awk '{ sum += $7; n++ } END { if (n > 0) print sum / n; }' "$REVIEW_LOG")
echo -e ""
echo -e "${LGREY}Category:${NC}\n\t\t${q[0]}" ${LGREY}Category:${NC}\n\t\t${q[0]}
echo -e "${LGREY}Question:${NC}\n\t\t${q[1]}" ${LGREY}Question:${NC}\n\t\t${q[1]}
echo -e ""
echo -e ""
echo -e "${LGREY}Press [Enter] to continue...${NC}" ${LGREY}Press [Enter] to continue...${NC}"
# shellcheck disable=SC2162 # shellcheck disable=SC2162
read -sn 1 NEXT read -sn 1 NEXT
while [ ! "$NEXT" = "" ] && [ ! "$NEXT" = q ] && [ ! "$NEXT" = Q ]; do while [ ! "$NEXT" = "" ] && [ ! "$NEXT" = q ] && [ ! "$NEXT" = Q ]; do
@ -238,26 +238,26 @@ main(){
read -sn 1 NEXT read -sn 1 NEXT
done done
clear clear
echo -e "${WHITEBG} Fla.sh - Flash Cards In Your Terminal ${NC}" echo -e "${WHITEBG} Fla.sh - Flash Cards In Your Terminal ${NC}
echo -e "${ORANGE}${BOLD}Cards Reviewed:${BOLD}${NC}\t$COUNTER" ${ORANGE}${BOLD}Cards Reviewed:${BOLD}${NC}\t$COUNTER
echo -e "\t${ORANGE}${BOLD}High Score:${BOLD}${NC}\t$(cat "$HIGH_SCORE")" \t${ORANGE}${BOLD}High Score:${BOLD}${NC}\t$(cat "$HIGH_SCORE")
echo -e "\t${ORANGE}${BOLD}Avg review:${BOLD}${NC}\t$(awk '{ sum += $7; n++ } END { if (n > 0) print sum / n; }' "$REVIEW_LOG")" \t${ORANGE}${BOLD}Avg review:${BOLD}${NC}\t$(awk '{ sum += $7; n++ } END { if (n > 0) print sum / n; }' "$REVIEW_LOG")
echo -e ""
echo -e "${LGREY}Category:${NC}\n\t\t${q[0]}" ${LGREY}Category:${NC}\n\t\t${q[0]}
echo -e "${LGREY}Question:${NC}\n\t\t${q[1]}" ${LGREY}Question:${NC}\n\t\t${q[1]}
echo -e "" "
if [ "$NEXT" = q ] || [ "$NEXT" = Q ]; then if [ "$NEXT" = q ] || [ "$NEXT" = Q ]; then
add_usage_entry && cd "$PWD" && clear && exit add_usage_entry && cd "$PWD" && clear && exit
fi fi
echo -e "${LGREY}Answer:${NC}\n\t\t${q[2]}" echo -e "${LGREY}Answer:${NC}\n\t\t${q[2]}
echo -e ""
echo -e "${WHITEBG}${WHITE}===========================================================${NC}" ${WHITEBG}${WHITE}===========================================================${NC}
echo -e ""
echo -e "${LGREY}How Difficult Was This Question?${NC}" ${LGREY}How Difficult Was This Question?${NC}
echo -e ""
echo -e "${LRED}Hard${NC} [1] ${RED}Difficult${NC} [2] ${YELLOW}Normal${NC} [3] ${GREEN}Mild${NC} [4] ${LGREEN}Easy${NC} [5]" ${LRED}Hard${NC} [1] ${RED}Difficult${NC} [2] ${YELLOW}Normal${NC} [3] ${GREEN}Mild${NC} [4] ${LGREEN}Easy${NC} [5]
echo -e ""
echo -e "${LGREY}Select a number to continue, or${NC} ${LRED}Q${NC} ${LGREY}to quit...${NC}" ${LGREY}Select a number to continue, or${NC} ${LRED}Q${NC} ${LGREY}to quit...${NC}"
# shellcheck disable=SC2162 # shellcheck disable=SC2162
read -sn 1 DIFFICULTY_SCORE read -sn 1 DIFFICULTY_SCORE
while [[ ! "$DIFFICULTY_SCORE" =~ [12345qQ] ]]; do while [[ ! "$DIFFICULTY_SCORE" =~ [12345qQ] ]]; do