From e24db2e68ce07ac7a11bcd5edefdda876d312203 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 12 Nov 2020 19:59:08 +0300
Subject: [PATCH] hr, calculator: bc -> bash

---
 scripts/calculator |  8 +++-----
 scripts/hr         | 12 +++++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/calculator b/scripts/calculator
index 65b3546..c99082a 100755
--- a/scripts/calculator
+++ b/scripts/calculator
@@ -6,10 +6,8 @@ vars=( $(echo {a..z}) )
 count=-1
 prompt=' '
 mesg=""
-# menu=dmenu
-menu="rofi -dmenu"
 
-while eqn=$(echo | rofi -dmenu -lines 0 -theme Monokai -mesg "$mesg" -p "$prompt  "); do
+while eqn=$(echo | rofi -dmenu -lines 0 -theme Monokai -mesg "$mesg" -p "$prompt  " -m eDP1); do
 	[[ $eqn ]] || exit
 
 	echo $eqn | grep '#'
@@ -23,9 +21,9 @@ while eqn=$(echo | rofi -dmenu -lines 0 -theme Monokai -mesg "$mesg" -p "$prompt
 	# if ans=$(calc -pd “$(eval echo $(echo $eqn | sed ‘s/([a-z])/$\1/g’))”); then
 	exp=$(eval echo $(echo \"$eqn\" | sed 's/#.*"/"/; s/\([a-z]\)/$\1/g'))
 
-	echo = $exp
+	echo=$exp
 
-	if ans=$(echo "$exp" | bc -l); then
+	if ans=$(( $exp )); then
 		echo -n $ans | xclip
 		count=$(( $count + 1 ))
 
diff --git a/scripts/hr b/scripts/hr
index 3dfe8f7..4c2259a 100755
--- a/scripts/hr
+++ b/scripts/hr
@@ -1,7 +1,13 @@
 #!/bin/bash
 
-# Создан:  Сб 05 апр 2014 11:02:41 
-# Изменён: Сб 05 апр 2014 11:11:54
+# Создан:  Сб 05 апр 2014 11:02:41
+# Изменён: Чт 12 ноя 2020 19:48:04
 
-printf "$green%$(echo `tput cols` - 12 | bc)s─[$yellow`\date '+%H:%M:%S'`$green]─$rstc" | sed 's/ /─/g'
+rstc="\033[00m"
+yellow="\033[1;33m"
+green="\033[1;32m"
+
+COLUMNS=$(tput cols)
+
+printf "$green%$(( COLUMNS - 12 ))s─[$yellow%(%H:%M:%S)T$green]─$rstc" | sed 's/ /─/g'