From 54ecc698f05ee9c91c7371c879cbb2520b9e16da Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Wed, 29 Sep 2021 22:45:12 +0200
Subject: [PATCH] Fix shellcheck issues
---
.config/bspwm/bspwmrc | 34 +++++++++++++++++-----------------
.config/zsh/.zshrc | 40 ++++++++++++++++------------------------
.xprofile | 4 ++--
3 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 464cc4c..7622cf3 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -8,31 +8,31 @@ bspc config focused_border_color "#ff79c6"
bspc config presel_feedback_color "#6272a4"
host_name=$(cat /proc/sys/kernel/hostname)
-if [[ $host_name == "portalo" ]]; then
- xrandr --output $MONITOR_PRIMARY --mode 2560x1440 --refresh 144
- xrandr --output $MONITOR_SECONDARY --left-of $MONITOR_PRIMARY
+if [ "$host_name" = "portalo" ]; then
+ xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144
+ xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY"
#primary="HDMI-A-0"
#secondary="DVI-D-0"
- bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 focus
- bspc monitor $MONITOR_SECONDARY -d side-view voip messenger
+ bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus
+ bspc monitor "$MONITOR_SECONDARY" -d side-view voip messenger
- bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
+ bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
sleep 1
- bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
+ bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
-elif [[ $host_name == *"laptop"* ]]; then
- xrandr --output $MONITOR_PRIMARY --auto
- xrandr --output $MONITOR_SECONDARY --left-of $MONITOR_PRIMARY --auto
+elif echo "$host_name" | grep -Eq "laptop"; then
+ xrandr --output "$MONITOR_PRIMARY" --auto
+ xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY" --auto
#primary="eDP-1"
#secondary="HDMI-2"
- bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 focus messenger
- bspc monitor $MONITOR_SECONDARY -d side-view 10
+ bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus messenger
+ bspc monitor "$MONITOR_SECONDARY" -d side-view 10
- bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
+ bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
sleep 1
- bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
+ bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
else
bspc monitor primary -d web terminal 3 4 5 6 7 8 9 focus
@@ -84,7 +84,7 @@ bspc rule -a 'Xarchiver' state='floating'
bspc rule -a 'Signal' desktop='messenger'
bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
-$HOME/.config/polybar/launch.sh &
+"$HOME/.config/polybar/launch.sh" &
-$HOME/.config/bspwm/swallow.py &
-$HOME/.config/bspwm/focus-voip.py &
+"$HOME/.config/bspwm/swallow.py" &
+"$HOME/.config/bspwm/focus-voip.py" &
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index b0dc967..f65ad8d 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -66,36 +66,28 @@ DISABLE_AUTO_UPDATE="false"
# Would you like to use another custom folder than $ZSH/custom?
ZSH_CUSTOM=$ZDOTDIR/custom
-priv_plugin=sudo
-if [ -x "$(command -v doas)" ]
-then
- priv_plugin=doas
-fi
-
# Which plugins would you like to load?
# Standard plugins can be found in $ZSH/plugins/
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(
- colored-man-pages
- copydir
- copyfile
- cp
- docker
- docker-compose
- encode64
- extract
- git
- git-auto-status
- httpie
- jump
- kubectl
- laravel5
- safe-paste
- vi-mode
-
- $priv_plugin
+ 'colored-man-pages'
+ 'copydir'
+ 'copyfile'
+ 'cp'
+ 'docker'
+ 'docker-compose'
+ 'encode64'
+ 'extract'
+ 'git'
+ 'git-auto-status'
+ 'httpie'
+ 'jump'
+ 'laravel5'
+ 'safe-paste'
+ 'sudo'
+ 'vi-mode'
)
source $ZSH/oh-my-zsh.sh
diff --git a/.xprofile b/.xprofile
index 3fd11c2..491f37b 100644
--- a/.xprofile
+++ b/.xprofile
@@ -19,7 +19,7 @@ audio_wait_pid=1
wait_for_service()
{
- until systemctl is-active --quiet $1
+ until systemctl is-active --quiet "$1"
do
sleep 0.5
done
@@ -56,7 +56,7 @@ _autostart_apps()
conky --daemonize --config="$HOME/.config/conky/clock.conf"
conky --daemonize --config="$HOME/.config/conky/system.conf"
conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf"
- feh --bg-fill $XDG_PICTURES_DIR/wallpaper/active_wallpaper
+ feh --bg-fill "$XDG_PICTURES_DIR/wallpaper/active_wallpaper"
#actkbd --grab --config ~/.config/actkbd/actkbd.conf --device /dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd &