From f91b64f847383c7aa1878d5d92e9ec63b7b2efb5 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
Date: Fri, 10 Jul 2015 02:04:11 +0200
Subject: dzen2_pgrp: Remove unneeded {} around variables
---
bin/dzen2_pgrp.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'bin')
diff --git a/bin/dzen2_pgrp.sh b/bin/dzen2_pgrp.sh
index 61777d3..277a197 100644
--- a/bin/dzen2_pgrp.sh
+++ b/bin/dzen2_pgrp.sh
@@ -1,43 +1,43 @@
#!/bin/sh
-DIR="${HOME}/.dzen2/"
+DIR="$HOME/.dzen2/"
FONT="-*-terminus-medium-r-normal-*-12-*-*-*-*-*-*-*"
SCREEN=1
DZEN2="$HOME/dev/dzen/dzen2"
MIXER="amixer -D pulse -q sset Master"
# get width of screen
-OFFSET=$(${DIR}/bin/xinerama-resolution ${SCREEN} | cut -dx -f1)
+OFFSET=$($DIR/bin/xinerama-resolution "$SCREEN" | cut -dx -f1)
CLOCK_WIDTH=$(textwidth "$FONT" "$(LC_ALL=C date)")
OFFSET=$((OFFSET - $CLOCK_WIDTH - 20))
-sh "${DIR}/bin/clock.sh" | $DZEN2 -xs ${SCREEN} -x ${OFFSET} -w $(($CLOCK_WIDTH + 20)) -fn "${FONT}" -bg black -l 17 -p -sa c -e 'button1=exec:xscreensaver-command -lock;button3=exec:xcalendar;button2=exec:xscreensaver-command -prefs;onstart=collapse;entertitle=uncollapse,unhide;leavetitle=collapse' &
+sh "$DIR/bin/clock.sh" | $DZEN2 -xs "$SCREEN" -x "$OFFSET" -w $(($CLOCK_WIDTH + 20)) -fn "$FONT" -bg black -l 17 -p -sa c -e 'button1=exec:xscreensaver-command -lock;button3=exec:xcalendar;button2=exec:xscreensaver-command -prefs;onstart=collapse;entertitle=uncollapse,unhide;leavetitle=collapse' &
if [ -e "/proc/acpi/battery/BAT0" ]; then
# if battery is available, display battery widget
OFFSET=$((OFFSET - 120))
- sh "${DIR}/bin/bat.sh" | $DZEN2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' &
+ sh "$DIR/bin/bat.sh" | $DZEN2 -xs "$SCREEN" -x "$OFFSET" -w 120 -fn "$FONT" -bg black -e 'button1=none' &
fi
OFFSET=$((OFFSET - 120))
-gcpubar -fg '#999' -bg '#444' -w 50 -h 7 -l "^i(${DIR}/icons/cpu.xbm) " | \
+gcpubar -fg '#999' -bg '#444' -w 50 -h 7 -l "^i($DIR/icons/cpu.xbm) " | \
sed -u 's/#D56F6C/#ff0000/' | \
- $DZEN2 -xs ${SCREEN} -x ${OFFSET} -w 120 -fn "${FONT}" -bg black -e 'button1=none' &
+ $DZEN2 -xs "$SCREEN" -x "$OFFSET" -w 120 -fn "$FONT" -bg black -e 'button1=none' &
OFFSET=$((OFFSET - 17))
-${DIR}/bin/pulse-dbus-receive.py | \
- $DZEN2 -xs ${SCREEN} -x ${OFFSET} -tw 17 -w 100 -fn "${FONT}" -bg black -sa c -l 1 \
+$DIR/bin/pulse-dbus-receive.py | \
+ $DZEN2 -xs "$SCREEN" -x "$OFFSET" -tw 17 -w 100 -fn "$FONT" -bg black -sa c -l 1 \
-e "entertitle=uncollapse,unhide;leavetitle=collapse;button2=exec:pavucontrol\
;button1=exec:$MIXER toggle;button3=exec:$MIXER 80%\
;button4=exec:$MIXER 2%+;button5=exec:$MIXER 2%-" &
# fill the rest of the screen with the information from xmonad
-cat $* | $DZEN2 -xs ${SCREEN} -x 0 -w ${OFFSET} -ta l -fn "${FONT}" -bg black -e 'button1=none' &
+cat $* | $DZEN2 -xs "$SCREEN" -x 0 -w "$OFFSET" -ta l -fn "$FONT" -bg black -e 'button1=none' &
MAIN=$!
# kill bars on new RandR config
-( ${DIR}/bin/xrandr-notify ; kill ${MAIN} ) &
+( $DIR/bin/xrandr-notify ; kill "$MAIN" ) &
-wait $MAIN
+wait "$MAIN"
# kill all
kill -TERM -$$
--
cgit v1.2.3