various changes

.local/bin/bt

@@ -1,7 +1,7 @@
 #!/bin/sh
 SCAN_PERIOD=5
 AUTOTRUST=false #trust every newly paired device
-AUTOSCAN=true #immediately start scanning when started to speed up pairing process
+AUTOSCAN=false #immediately start scanning when started to speed up pairing process
 #locations of blacklist and hard coded list of paired devices (watch out, need to modify Makefile as well if you want to change these values and still use make install)
 BLACKLIST=${XDG_DATA_HOME:-$HOME/.local/share}/bt/blacklist
 PAIRLIST=${XDG_DATA_HOME:-$HOME/.local/share}/bt/paired
@@ -30,11 +30,12 @@ scan(){
 	scanstatus="$( bluetoothctl show | grep Discovering | awk '{print $2}' )"
 	if [ "$1" = on ]; then
 		#sets variable in case scanning was no already on before the start of bt
-		[ "$start_scan" = "" ] && start_scan="$( date +'%s' )"
+		[ -f /tmp/bt_start_scan$$ ] || start_scan="$( date +'%s' )"
 		if [ "$scanstatus" = "no" ]; then
 			bluetoothctl scan on &
 			start_scan="$( date +'%s' )"
 		fi
+		echo "$start_scan" > /tmp/bt_start_scan$$
 	elif [ "$1" = off ]; then
 		if [ "$scanstatus" = "yes" ]; then
 			bluetoothctl scan off
@@ -54,8 +55,15 @@ update_pair_list(){
 
 
 #start scanning as early as possible to speed up pairing process
-#In function to more quickly display the menu
 startup(){
+	#remove old tmp files
+	for f in /tmp/*
+	do
+	  case $f in
+	    /tmp/bt_start_scan*) rm "$f";;
+	    *) true;;
+	  esac
+	done
 	if $AUTOSCAN
 	then
 		power on
@@ -64,7 +72,7 @@ startup(){
 }
 
 #Sadly needs to be run without '&' for now, since it otherwise breaks start_scan variable
-startup
+startup &
 update_pair_list &
 
 # shellcheck disable=SC1091
@@ -91,6 +99,7 @@ poweroption="$( echo "$powerstatus" | sed 's/yes/power off/; s/no/power on/' )"
 
 cleanup(){
 	scan off
+	rm /tmp/bt_start_scan$$ 2> /dev/null
 	exit 0
 }
 
@@ -99,6 +108,7 @@ pair(){
 	power on
 	scan on
 	#check whether $SCAN_PERIOD seconds has already passed since starting scanning, if not, wait for the rest of that time.
+	start_scan="$(cat /tmp/bt_start_scan$$)"
 	if [ $((( "$(date +'%s')" - "$start_scan" ))) -lt $SCAN_PERIOD ]; then
 		sleep_period="$((( "$SCAN_PERIOD" - "$( date +'%s')" + "$start_scan" )))"
 		if [ "$sleep_period" -eq 1 ]; then
@@ -125,6 +135,7 @@ pair(){
 	if [ -n "$choice" ]; then
 		if [ "$choice" = "rescan" ]; then
 			start_scan="$( date +'%s')"
+			echo "$start_scan" > /tmp/bt_start_scan$$
 			pair
 		else
 			dev_no=$( echo "$new_devices" | nl | grep "$choice" | awk '{print $1}')
@@ -210,7 +221,9 @@ case $choice in
 		[ "$dev_no" != "" ] && dev_id=$( echo "$bt_IDS" | nl | grep -P "^.*$dev_no\t" | awk '{print $2}')
 		if [ -n "$dev_id" ]; then
 			power on
-			bluetoothctl pair "$dev_id"
+			bluetoothctl devices | grep -q "$dev_id" || bluetoothctl pair "$dev_id"
 			bluetoothctl connect "$dev_id"
 		fi;;
 esac
+
+cleanup

.local/bin/dropdowncalc

@@ -1,2 +1,2 @@
 #!/bin/sh
-ifinstalled python && python -iq -c "print('Welcome to the Calculator'); from numpy import *"
+ifinstalled python && python -iq -c "print('Welcome to the Calculator'); from numpy import *; import sys; sys.ps1='>'"

.local/bin/statusbar/cpu

@@ -7,6 +7,6 @@ case $BLOCK_BUTTON in
 - % is of single core." ;;
 esac
 
-temp=$(sensors | awk '/Package id 0/ {print "🌡 "$4}' | sed 's/\.[0-9]//; s/+//')
+temp=$(sensors | awk '/Package id 0/ {print "🌡"$4}' | sed 's/\.[0-9]//; s/+//')
 [ -n "$temp" ] && echo $temp > /tmp/cpu_temp
 cat /tmp/cpu_temp

.local/bin/statusbar/getbright

@@ -1,2 +1,2 @@
 #!/bin/bash
-echo ☀ $(bc <<< "scale=0; $(cat /sys/class/backlight/intel_backlight/brightness) /9.37")%
+echo ☀$(bc <<< "scale=0; $(cat /sys/class/backlight/intel_backlight/brightness) /9.37")%

.local/bin/statusbar/getmail

@@ -1,3 +1,3 @@
 #!/bin/bash
 num=$(find ~/.local/share/mail/*/INBOX/new -type f | wc -l)
-[ $num != 0 ] && echo "📬 "$num
+[ $num != 0 ] && echo "📬"$num

.local/bin/statusbar/music

@@ -4,6 +4,6 @@ if [ $( mpc status | grep '\[paused\]' | wc -l ) -eq 1 ]; then
 fi
 
 if [ $( mpc status | grep '\[playing\]' | wc -l ) -eq 1 ]; then
-	#echo $(mpc status | sed "/^volume:/d" | tac | sed -e "s/\\[paused\\].*//g;s/\\[playing\\].*//g" | tr -d '\n' | sed -e "s/$/ /g")
+	echo $(mpc status | sed "/^volume:/d" | tac | sed -e "s/\\[paused\\].*//g;s/\\[playing\\].*//g" | tr -d '\n' | sed -e "s/$/ /g")
 	exit
 fi

.local/bin/statusbar/nettraf

@@ -27,8 +27,14 @@ lasttime=${XDG_CACHE_HOME:-$HOME/.cache}/nettraf_time
 rx=$(update /sys/class/net/[ew]*/statistics/rx_bytes)
 tx=$(update /sys/class/net/[ew]*/statistics/tx_bytes)
 timedifference=$(( "$(date +'%s')" - "$previoustime" ))
-rx_avg=$(( "$rx" / "$timedifference" ))
-tx_avg=$(( "$tx" / "$timedifference" ))
+if [ -n "$timedifference" ]; then
+	rx_avg=$(( "$rx" / "$timedifference" ))
+	tx_avg=$(( "$rx" / "$timedifference" ))
+else
+	rx_avg=rx_bytes
+	tx_avg=tx_bytes
+fi
+
 
 #only print if any traffic at all
 if [ "$rx_avg" -gt 0 ] || [ "$tx_avg" -gt 0 ]

.local/bin/statusbar/news

@@ -1,3 +1,4 @@
 #!/bin/bash
+newsboat -x reload
 num=$( cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print $1}' | sed s/^0$//g)$(cat ~/.config/newsboat/.update 2>/dev/null)")
 [ "$num" = "" ] || echo 📰$num

.local/bin/statusbar/pacpackages

@@ -1,18 +1,9 @@
 #!/bin/sh
 
-# i3blocks module for pacman upgrades.
 # Displays number of upgradeable packages.
 # For this to work, have a `pacman -Sy` command run in the background as a
 # cronjob every so often as root. This script will then read those packages.
 # When clicked, it will run an upgrade via pacman.
 
-case $BLOCK_BUTTON in
-	1) $TERMINAL -e popupgrade ;;
-	2) notify-send "$(/usr/bin/pacman -Qu)" ;;
-	3) pgrep -x dunst >/dev/null && notify-send "Upgrade module" "📦: number of upgradable packages
-- Left click to upgrade packages
-- Middle click to show upgradable packages" ;;
-esac
-
-
-pacman -Qu | grep -v "\[ignored\]" | wc -l | sed -e "s/^0$//g"
+no="$( pacman -Qu | grep -Fcv "[ignored]" )"
+echo "$no" | sed "s/^/📦/;s/^📦0$//g"

.local/bin/statusbar/popupgrade

@@ -2,7 +2,7 @@
 
 printf "Beginning upgrade.\\n"
 
-yay -Syu
+yay -Qyu
 pkill -RTMIN+8 i3blocks
 
 printf "\\nUpgrade complete.\\nPress <Enter> to exit window.\\n\\n"

.local/bin/statusbar/volume

@@ -45,4 +45,4 @@ else
 	icon="🔉"
 fi
 
-printf "%s %s%%\\n" "$icon" "$vol"
+printf "%s%s%%\\n" "$icon" "$vol"