From af89305dfee7222bdbbdc8b9572c9c80575541ad Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Sat, 10 Dec 2022 11:04:35 +0330 Subject: update --- tmux/date.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tmux/date.sh') diff --git a/tmux/date.sh b/tmux/date.sh index b3f6436..ca75a6d 100755 --- a/tmux/date.sh +++ b/tmux/date.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/sh # source common.sh SEPARATOR_LEFT_BOLD="" SEPARATOR_LEFT_THIN="" RESULT=$(date +"%a %D %H:%M") -#PROXY="proxychains4 -f /home/devi/proxies/ca/proxychains.conf" +PROXY="proxychains4 -q -f /home/devi/proxies/ice/proxychains.conf" DAY="#[fg=colour255 bg=colour31]"$(echo "$RESULT" | gawk '{print $1}') DATE="#[fg=colour255 bg=colour31]"$(echo "$RESULT" | gawk '{print $2}') @@ -16,20 +16,18 @@ JDATE="#[fg=colour255 bg=colour29]"$(jdate | gawk '{print $2" "$3}') # OPENWEATHERMAP_TOKEN=$(jq -r ".token" < /home/devi/scripts/tmux/openweathermap.json) # WEATHER_INFO=$(sleep 120 && proxychains4 -q -f /home/devi/proxies/ice/proxychains.conf curl "https://api.openweathermap.org/data/2.5/weather?q=Tehran&appid=${OPENWEATHERMAP_TOKEN}&units=metric"|jq ".main.temp") -WEATHER_INFO=$(proxychains4 -f ~/proxies/ice/proxychains.conf curl 'wttr.in/tehran?T&format=%f') +WEATHER_INFO=$(${PROXY} curl -s 'wttr.in/tehran?T&format=%f') if echo "${WEATHER_INFO}" | grep Unknown\ location; then WEATHER="#[fg=colour255 bg=colour32]"no_temp else WEATHER="#[fg=colour255 bg=colour32]"${WEATHER_INFO} fi -date >> /tmp/time_counter - -CPU_TEMP=$(sensors -j | jq .["\"coretemp-isa-0000\""]."\"Package id 0\"".temp1_input) -CPU_SECTION="#[fg=colour36 bg=colour24]${SEPARATOR_LEFT_BOLD}#[fg=colour16 bg=colour36]${CPU_TEMP} C" +CPU_TEMP=$(sensors -j 2>/dev/null | jq .["\"coretemp-isa-0000\""]."\"Package id 0\"".temp1_input) +CPU_SECTION="#[fg=colour36 bg=colour24]${SEPARATOR_LEFT_BOLD}#[fg=colour16 bg=colour36]${CPU_TEMP}°C" BATTERY=$(upower -i "$(upower -e | grep 'BAT')" | grep -E "percentage" | awk '{print $2}') -if ! headsetcontrol -b ; then +if ! headsetcontrol -b >/dev/null 2>&1; then HEADSET_BATTERY="not found" else HEADSET_BATTERY=$(headsetcontrol -b | grep Battery | awk '{print $2}') -- cgit v1.2.3