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

fix merge issue 

cli can be a pain sometimes
This commit is contained in:
Bryan Jenks 2020-07-19 19:01:25 -07:00 committed by GitHub
parent 4813d37150
commit f7293945b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flash
View File

@ -250,14 +250,9 @@ $(if [ ${#QUESTION} -lt 59 ]; then printf "%$(( ( 59 - ${#QUESTION} ) / 2 ))s";
add_usage_entry(){ add_usage_entry(){
if [ ! "$COUNTER" = 0 ]; then if [ ! "$COUNTER" = 0 ]; then
# Create a New Entry # Create a New Entry
<<<<<<< HEAD
TIME_STAMP=$(date +"%Y%m%d %H:%M:%S") TIME_STAMP=$(date +"%Y%m%d %H:%M:%S")
REVIEWED_DECK="$(echo "$EXAMPLE_DECK" | awk -F/ '{print $7}')" REVIEWED_DECK="$(echo "$EXAMPLE_DECK" | awk -F/ '{print $7}')"
printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$REVIEWED_DECK" "$COUNTER"
=======
TIME_STAMP=$(date --rfc-3339=seconds)
printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$CURRENT_DECK" "$COUNTER" printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$CURRENT_DECK" "$COUNTER"
>>>>>>> 96762bab041d0351c1bc8e94e38757aa2f618013
echo "$ENTRY" >> "$REVIEW_LOG" echo "$ENTRY" >> "$REVIEW_LOG"
fi fi
} }