mirror of
https://github.com/TECHNOFAB11/tmux2k.git
synced 2025-12-11 23:50:08 +01:00
style: shellcheck fixes
This commit is contained in:
Abhishek Keshri
parent
54ecf3dc0b
commit
de0e8225a6
10 changed files with 356 additions and 389 deletions
|
|
@ -3,7 +3,7 @@
|
|||
export LC_ALL=en_US.UTF-8
|
||||
|
||||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source $current_dir/utils.sh
|
||||
source "$current_dir"/utils.sh
|
||||
|
||||
linux_acpi() {
|
||||
arg=$1
|
||||
|
|
@ -11,15 +11,15 @@ linux_acpi() {
|
|||
if [ ! -x "$(which acpi 2>/dev/null)" ]; then
|
||||
case "$arg" in
|
||||
status)
|
||||
cat $BAT/status
|
||||
cat "$BAT"/status
|
||||
;;
|
||||
|
||||
percent)
|
||||
cat $BAT/capacity
|
||||
cat "$BAT"/capacity
|
||||
;;
|
||||
|
||||
*)
|
||||
;;
|
||||
*) ;;
|
||||
|
||||
esac
|
||||
else
|
||||
case "$arg" in
|
||||
|
|
@ -29,14 +29,13 @@ linux_acpi() {
|
|||
percent)
|
||||
acpi | cut -d: -f2- | cut -d, -f2 | tr -d '% '
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
*) ;;
|
||||
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
battery_percent()
|
||||
{
|
||||
battery_percent() {
|
||||
# Check OS
|
||||
case $(uname -s) in
|
||||
Linux)
|
||||
|
|
@ -56,13 +55,12 @@ battery_percent()
|
|||
# leaving empty - TODO - windows compatability
|
||||
;;
|
||||
|
||||
*)
|
||||
;;
|
||||
*) ;;
|
||||
|
||||
esac
|
||||
}
|
||||
|
||||
battery_status()
|
||||
{
|
||||
battery_status() {
|
||||
# Check OS
|
||||
case $(uname -s) in
|
||||
Linux)
|
||||
|
|
@ -81,8 +79,8 @@ battery_status()
|
|||
# leaving empty - TODO - windows compatability
|
||||
;;
|
||||
|
||||
*)
|
||||
;;
|
||||
*) ;;
|
||||
|
||||
esac
|
||||
|
||||
case $status in
|
||||
|
|
@ -109,8 +107,7 @@ battery_status()
|
|||
# fi
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
bat_label=$(get_tmux_option "@tmux2k-battery-label" "")
|
||||
bat_stat=$(battery_status)
|
||||
bat_perc=$(battery_percent)
|
||||
|
|
@ -126,4 +123,3 @@ main()
|
|||
|
||||
#run main driver program
|
||||
main
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ export LC_ALL=en_US.UTF-8
|
|||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$current_dir"/utils.sh
|
||||
|
||||
get_percent()
|
||||
{
|
||||
get_percent() {
|
||||
case $(uname -s) in
|
||||
Linux)
|
||||
percent=$(LC_NUMERIC=en_US.UTF-8 top -bn2 -d 0.01 | grep "Cpu(s)" | tail -1 | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print 100 - $1"%"}')
|
||||
|
|
@ -31,7 +30,7 @@ get_load() {
|
|||
case $(uname -s) in
|
||||
Linux | Darwin)
|
||||
loadavg=$(uptime | awk -F'[a-z]:' '{ print $2}' | sed 's/,//g')
|
||||
echo $loadavg
|
||||
echo "$loadavg"
|
||||
;;
|
||||
|
||||
CYGWIN* | MINGW32* | MSYS* | MINGW*)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source $current_dir/utils.sh
|
||||
source "$current_dir"/utils.sh
|
||||
|
||||
IFS=' ' read -r -a hide_status <<<$(get_tmux_option "@tmux2k-git-disable-status" "false")
|
||||
IFS=' ' read -r -a current_symbol <<<$(get_tmux_option "@tmux2k-git-show-current-symbol" "")
|
||||
|
|
@ -9,16 +9,13 @@ IFS=' ' read -r -a diff_symbol <<< $(get_tmux_option "@tmux2k-git-show-diff-symb
|
|||
IFS=' ' read -r -a no_repo_message <<<$(get_tmux_option "@tmux2k-git-no-repo-message" "")
|
||||
|
||||
# Get added, modified, updated and deleted files from git status
|
||||
getChanges()
|
||||
{
|
||||
declare -i added=0;
|
||||
declare -i modified=0;
|
||||
declare -i updated=0;
|
||||
declare -i deleted=0;
|
||||
getChanges() {
|
||||
declare -i added=0
|
||||
declare -i modified=0
|
||||
declare -i updated=0
|
||||
declare -i deleted=0
|
||||
|
||||
for i in $(git -C $path status -s)
|
||||
|
||||
do
|
||||
for i in $(git -C "$path" status -s); do
|
||||
case $i in
|
||||
'A')
|
||||
added+=1
|
||||
|
|
@ -42,18 +39,15 @@ for i in $(git -C $path status -s)
|
|||
[ $updated -gt 0 ] && output+=" ${updated} "
|
||||
[ $deleted -gt 0 ] && output+=" ${deleted} "
|
||||
|
||||
echo $output
|
||||
echo "$output"
|
||||
}
|
||||
|
||||
|
||||
# getting the #{pane_current_path} from tmux2k.sh is no longer possible
|
||||
getPaneDir()
|
||||
{
|
||||
getPaneDir() {
|
||||
nextone="false"
|
||||
for i in $(tmux list-panes -F "#{pane_active} #{pane_current_path}");
|
||||
do
|
||||
for i in $(tmux list-panes -F "#{pane_active} #{pane_current_path}"); do
|
||||
if [ "$nextone" == "true" ]; then
|
||||
echo $i
|
||||
echo "$i"
|
||||
return
|
||||
fi
|
||||
if [ "$i" == "1" ]; then
|
||||
|
|
@ -62,10 +56,8 @@ getPaneDir()
|
|||
done
|
||||
}
|
||||
|
||||
|
||||
# check if the current or diff symbol is empty to remove ugly padding
|
||||
checkEmptySymbol()
|
||||
{
|
||||
checkEmptySymbol() {
|
||||
symbol=$1
|
||||
if [ "$symbol" == "" ]; then
|
||||
echo "true"
|
||||
|
|
@ -75,10 +67,9 @@ checkEmptySymbol()
|
|||
}
|
||||
|
||||
# check to see if the current repo is not up to date with HEAD
|
||||
checkForChanges()
|
||||
{
|
||||
checkForChanges() {
|
||||
if [ "$(checkForGitDir)" == "true" ]; then
|
||||
if [ "$(git -C $path status -s)" != "" ]; then
|
||||
if [ "$(git -C "$path" status -s)" != "" ]; then
|
||||
echo "true"
|
||||
else
|
||||
echo "false"
|
||||
|
|
@ -89,9 +80,8 @@ checkForChanges()
|
|||
}
|
||||
|
||||
# check if a git repo exists in the directory
|
||||
checkForGitDir()
|
||||
{
|
||||
if [ "$(git -C $path rev-parse --abbrev-ref HEAD)" != "" ]; then
|
||||
checkForGitDir() {
|
||||
if [ "$(git -C "$path" rev-parse --abbrev-ref HEAD)" != "" ]; then
|
||||
echo "true"
|
||||
else
|
||||
echo "false"
|
||||
|
|
@ -99,18 +89,16 @@ checkForGitDir()
|
|||
}
|
||||
|
||||
# return branch name if there is one
|
||||
getBranch()
|
||||
{
|
||||
getBranch() {
|
||||
if [ $(checkForGitDir) == "true" ]; then
|
||||
printf "%.20s " $(git -C $path rev-parse --abbrev-ref HEAD)
|
||||
printf "%.20s " $(git -C "$path" rev-parse --abbrev-ref HEAD)
|
||||
else
|
||||
echo $no_repo_message
|
||||
echo "$no_repo_message"
|
||||
fi
|
||||
}
|
||||
|
||||
# return the final message for the status bar
|
||||
getMessage()
|
||||
{
|
||||
getMessage() {
|
||||
if [ $(checkForGitDir) == "true" ]; then
|
||||
branch="$(getBranch)"
|
||||
|
||||
|
|
@ -119,13 +107,13 @@ getMessage()
|
|||
changes="$(getChanges)"
|
||||
|
||||
if [ "${hide_status}" == "false" ]; then
|
||||
if [ $(checkEmptySymbol $diff_symbol) == "true" ]; then
|
||||
if [ $(checkEmptySymbol "$diff_symbol") == "true" ]; then
|
||||
echo "${changes} $branch"
|
||||
else
|
||||
echo "$diff_symbol ${changes} $branch"
|
||||
fi
|
||||
else
|
||||
if [ $(checkEmptySymbol $diff_symbol) == "true" ]; then
|
||||
if [ $(checkEmptySymbol "$diff_symbol") == "true" ]; then
|
||||
echo "$branch"
|
||||
else
|
||||
echo "$diff_symbol $branch"
|
||||
|
|
@ -133,19 +121,18 @@ getMessage()
|
|||
fi
|
||||
|
||||
else
|
||||
if [ $(checkEmptySymbol $current_symbol) == "true" ]; then
|
||||
if [ $(checkEmptySymbol "$current_symbol") == "true" ]; then
|
||||
echo "$branch"
|
||||
else
|
||||
echo "$current_symbol $branch"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo $no_repo_message
|
||||
echo "$no_repo_message"
|
||||
fi
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
path=$(getPaneDir)
|
||||
getMessage
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ export LC_ALL=en_US.UTF-8
|
|||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$current_dir"/utils.sh
|
||||
|
||||
get_platform()
|
||||
{
|
||||
get_platform() {
|
||||
case $(uname -s) in
|
||||
Linux)
|
||||
gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}')
|
||||
|
|
@ -23,8 +22,7 @@ get_platform()
|
|||
esac
|
||||
}
|
||||
|
||||
get_gpu()
|
||||
{
|
||||
get_gpu() {
|
||||
gpu=$(get_platform)
|
||||
if [[ "$gpu" == NVIDIA ]]; then
|
||||
usage=$(nvidia-smi | grep '%' | awk '{ sum += $13 } END { printf("%d%%\n", sum / NR) }')
|
||||
|
|
@ -34,8 +32,7 @@ get_gpu()
|
|||
normalize_percent_len $usage
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
# storing the refresh rate in the variable RATE, default is 5
|
||||
RATE=$(get_tmux_option "@tmux2k-refresh-rate" 5)
|
||||
gpu_label=$(get_tmux_option "@tmux2k-gpu-usage-label" "GPU")
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@
|
|||
export LC_ALL=en_US.UTF-8
|
||||
|
||||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source $current_dir/utils.sh
|
||||
source "$current_dir"/utils.sh
|
||||
|
||||
get_percent()
|
||||
{
|
||||
get_percent() {
|
||||
case $(uname -s) in
|
||||
Linux)
|
||||
total_mem_gb=$(free -g | awk '/^Mem/ {print $2}')
|
||||
|
|
@ -15,13 +14,13 @@ get_percent()
|
|||
if (("$total_mem_gb" == 0)); then
|
||||
memory_usage=$(free -m | awk '/^Mem/ {print $3}')
|
||||
total_mem_mb=$(free -m | awk '/^Mem/ {print $2}')
|
||||
echo $memory_usage\M\B/$total_mem_mb\M\B
|
||||
echo "$memory_usage"\M\B/"$total_mem_mb"\M\B
|
||||
elif (("$used_mem" == 0)); then
|
||||
memory_usage=$(free -m | awk '/^Mem/ {print $3}')
|
||||
echo $memory_usage\M\B/$total_mem_gb\G\B
|
||||
echo "$memory_usage"\M\B/"$total_mem_gb"\G\B
|
||||
else
|
||||
memory_usage=$(free -g | awk '/^Mem/ {print $3}')
|
||||
echo $memory_usage\G\B/$total_mem_gb\G\B
|
||||
echo "$memory_usage"\G\B/"$total_mem_gb"\G\B
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -30,7 +29,7 @@ get_percent()
|
|||
used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | awk -v pagesize=$(pagesize) '{printf "%d\n", ($1+$2) * pagesize / 1048576}')
|
||||
total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2 $3}')
|
||||
if (("$used_mem" < 1024)); then
|
||||
echo $used_mem\M\B/$total_mem
|
||||
echo "$used_mem"\M\B/"$total_mem"
|
||||
else
|
||||
memory=$(($used_mem / 1024))
|
||||
echo $memory\G\B/$total_mem
|
||||
|
|
@ -62,8 +61,7 @@ get_percent()
|
|||
esac
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
# storing the refresh rate in the variable RATE, default is 5
|
||||
RATE=$(get_tmux_option "@tmux2k-refresh-rate" 5)
|
||||
ram_label=$(get_tmux_option "@tmux2k-ram-usage-label" "")
|
||||
|
|
|
|||
|
|
@ -11,15 +11,13 @@ fixedlocation=$3
|
|||
LOCKFILE=/tmp/.tmux2k-tmux-weather.lock
|
||||
DATAFILE=/tmp/.tmux2k-tmux-data
|
||||
|
||||
ensure_single_process()
|
||||
{
|
||||
ensure_single_process() {
|
||||
# check for another running instance of this script and terminate it if found
|
||||
[ -f $LOCKFILE ] && ps -p "$(cat $LOCKFILE)" -o cmd= | grep -F " ${BASH_SOURCE[0]}" && kill "$(cat $LOCKFILE)"
|
||||
echo $$ >$LOCKFILE
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
ensure_single_process
|
||||
|
||||
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
|
@ -30,11 +28,9 @@ main()
|
|||
|
||||
"$current_dir"/weather.sh >$DATAFILE
|
||||
|
||||
while tmux has-session &> /dev/null
|
||||
do
|
||||
while tmux has-session &>/dev/null; do
|
||||
"$current_dir"/weather.sh "$fahrenheit" "$location" "$fixedlocation" >$DATAFILE
|
||||
if tmux has-session &> /dev/null
|
||||
then
|
||||
if tmux has-session &>/dev/null; then
|
||||
sleep 1200
|
||||
else
|
||||
break
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ main() {
|
|||
# Handle left icon padding
|
||||
padding=""
|
||||
if [ "$show_left_icon_padding" -gt "0" ]; then
|
||||
padding="$(printf '%*s' $show_left_icon_padding)"
|
||||
padding="$(printf '%*s' "$show_left_icon_padding")"
|
||||
fi
|
||||
left_icon="$left_icon$padding"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,4 +22,3 @@ normalize_percent_len() {
|
|||
let right_spaces=($diff_len)/2
|
||||
printf "%${left_spaces}s%s%${right_spaces}s\n" "" $1 ""
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,8 @@ fahrenheit=$1
|
|||
location=$2
|
||||
fixedlocation=$3
|
||||
|
||||
display_location()
|
||||
{
|
||||
if $location && [[ ! -z "$fixedlocation" ]]; then
|
||||
display_location() {
|
||||
if $location && [[ -n "$fixedlocation" ]]; then
|
||||
echo " $fixedlocation"
|
||||
elif $location; then
|
||||
city=$(curl -s https://ipinfo.io/city 2>/dev/null)
|
||||
|
|
@ -19,16 +18,14 @@ display_location()
|
|||
fi
|
||||
}
|
||||
|
||||
fetch_weather_information()
|
||||
{
|
||||
fetch_weather_information() {
|
||||
display_weather=$1
|
||||
# it gets the weather condition textual name (%C), and the temperature (%t)
|
||||
curl -sL wttr.in/$fixedlocation\?format="%C+%t$display_weather"
|
||||
curl -sL wttr.in/"$fixedlocation"\?format="%C+%t$display_weather"
|
||||
}
|
||||
|
||||
#get weather display
|
||||
display_weather()
|
||||
{
|
||||
display_weather() {
|
||||
if $fahrenheit; then
|
||||
display_weather='&u' # for USA system
|
||||
else
|
||||
|
|
@ -43,8 +40,7 @@ display_weather()
|
|||
echo "$unicode${temperature/+/}" # remove the plus sign to the temperature
|
||||
}
|
||||
|
||||
forecast_unicode()
|
||||
{
|
||||
forecast_unicode() {
|
||||
weather_condition=$(echo "$weather_condition" | awk '{print tolower($0)}')
|
||||
|
||||
if [[ $weather_condition =~ 'snow' ]]; then
|
||||
|
|
@ -60,8 +56,7 @@ forecast_unicode()
|
|||
fi
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
main() {
|
||||
# process should be cancelled when session is killed
|
||||
if ping -q -c 1 -W 1 ipinfo.io &>/dev/null; then
|
||||
echo "$(display_weather)$(display_location)"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue