diff --git a/modules/module_bat b/modules/module_bat index dfe7143..54b6fce 100755 --- a/modules/module_bat +++ b/modules/module_bat @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" # argument 1 ARG1="$1" diff --git a/modules/module_date b/modules/module_date index 29247ce..baf2ae2 100755 --- a/modules/module_date +++ b/modules/module_date @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_dfmpeg b/modules/module_dfmpeg index 98fa9a7..a5f27e8 100755 --- a/modules/module_dfmpeg +++ b/modules/module_dfmpeg @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_music b/modules/module_music index f1444d4..6b4fb32 100755 --- a/modules/module_music +++ b/modules/module_music @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_net b/modules/module_net index 4ae5d0d..4349fd5 100755 --- a/modules/module_net +++ b/modules/module_net @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_news b/modules/module_news index b37c328..e245b3f 100755 --- a/modules/module_news +++ b/modules/module_news @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" # argument 1 ARG1="$1" diff --git a/modules/module_ram b/modules/module_ram index 0c7afa1..d5b9b47 100755 --- a/modules/module_ram +++ b/modules/module_ram @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_temp b/modules/module_temp index 97c78e8..00573ae 100755 --- a/modules/module_temp +++ b/modules/module_temp @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_time b/modules/module_time index ca39d7f..840708f 100755 --- a/modules/module_time +++ b/modules/module_time @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_vol b/modules/module_vol index 5d5fa4f..afbeb00 100755 --- a/modules/module_vol +++ b/modules/module_vol @@ -3,7 +3,7 @@ # # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARG1="$1" diff --git a/modules/module_weather b/modules/module_weather index 385b46d..a905e3d 100755 --- a/modules/module_weather +++ b/modules/module_weather @@ -3,7 +3,7 @@ # load config . $HOME/.config/speedwm-de/status/config -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" # argument 1 ARG1="$1" diff --git a/scripts/speedwm-audioctrl b/scripts/speedwm-audioctrl index 6cc4e34..2e44bf2 100755 --- a/scripts/speedwm-audioctrl +++ b/scripts/speedwm-audioctrl @@ -4,7 +4,7 @@ # Run speedwm-audioctrl -help for more information! # License: GPLv3. -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" MUTE() { # Mute for pulseaudio/pipewire diff --git a/scripts/speedwm-btctrl b/scripts/speedwm-btctrl index 56504b0..12476d3 100755 --- a/scripts/speedwm-btctrl +++ b/scripts/speedwm-btctrl @@ -9,7 +9,7 @@ CHECK() { "") RUNLAUNCHER=dmenu ;; esac - BINDIR="$(dirname $(command -v status))/" + BINDIR="$(dirname $(command -v speedwm_status))/" } HAVE_GRID="true" diff --git a/scripts/speedwm-compatcheck b/scripts/speedwm-compatcheck index 6e4abfe..fdac269 100755 --- a/scripts/speedwm-compatcheck +++ b/scripts/speedwm-compatcheck @@ -2,7 +2,7 @@ # speedwm-compatcheck # compatibility checker used by 'make' when compiling speedwm. -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" # Check if xrdb exists if [ -e "${BINDIR}xrdb" ]; then diff --git a/scripts/speedwm-core b/scripts/speedwm-core index af0f5a5..bd043f3 100755 --- a/scripts/speedwm-core +++ b/scripts/speedwm-core @@ -2,7 +2,7 @@ # speedwm-core # This script handles the updating and other things necessary for keybinds. -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" # update UPDATE_SPEEDWM() { diff --git a/scripts/speedwm-netctrl b/scripts/speedwm-netctrl index ca4c776..6296063 100755 --- a/scripts/speedwm-netctrl +++ b/scripts/speedwm-netctrl @@ -7,7 +7,7 @@ case "$RUNLAUNCHER" in "") RUNLAUNCHER=dmenu ;; esac -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" command -v iwctl > /dev/null || exit 1 diff --git a/scripts/speedwm-screenshotutil b/scripts/speedwm-screenshotutil index fbcf19a..df24ed1 100755 --- a/scripts/speedwm-screenshotutil +++ b/scripts/speedwm-screenshotutil @@ -11,7 +11,7 @@ case "$RUNLAUNCHER" in "") RUNLAUNCHER=dmenu ;; esac -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" HAVE_GRID="true" if [ -e "$HOME/.config/speedwm-de/global/config" ]; then diff --git a/scripts/speedwm-shutdown b/scripts/speedwm-shutdown index 16003f0..922e521 100755 --- a/scripts/speedwm-shutdown +++ b/scripts/speedwm-shutdown @@ -28,7 +28,7 @@ if [ "$HAVE_GRID" = "true" ]; then GRIDARG="-g" fi -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" EXPORTDIR=$HOME/.config/speedwm-de/powermenu mkdir -p $EXPORTDIR diff --git a/scripts/speedwm-stellar b/scripts/speedwm-stellar index f79c67a..b617638 100755 --- a/scripts/speedwm-stellar +++ b/scripts/speedwm-stellar @@ -1,5 +1,6 @@ #!/bin/sh -# Status bar for speedwm +# stellar - Status bar for speedwm +# # Written by speedie.gq in POSIX sh for https://speedie.gq/speedwm # Licensed under the GNU GPLv3 free software license. # @@ -203,7 +204,7 @@ printf "Loaded $0 $VER\n---\n" # Set it to /usr/bin if it was not possible to get it through /usr/share/speedwm-bindir case "$BINDIR" in -"") BINDIR="$(dirname $(command -v status))/" ;; +"") BINDIR="$(dirname $(command -v speedwm_status))/" ;; esac # RAM usage diff --git a/scripts/speedwm-swal b/scripts/speedwm-swal index 385e368..fb50642 100755 --- a/scripts/speedwm-swal +++ b/scripts/speedwm-swal @@ -101,7 +101,7 @@ SWAL_MKCONFIG() { } # Binary directory -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" SWAL_OLDWALLPAPERDIR=$SWAL_WALLPAPERDIR # Source things diff --git a/scripts/speedwm-utils b/scripts/speedwm-utils index 0c92f8d..3157f24 100755 --- a/scripts/speedwm-utils +++ b/scripts/speedwm-utils @@ -24,7 +24,7 @@ if [ "$HAVE_GRID" = "true" ]; then fi VARS() { - BINDIR="$(dirname $(command -v status))/" + BINDIR="$(dirname $(command -v speedwm_status))/" } VARS diff --git a/scripts/speedwm-virtualkeyboard b/scripts/speedwm-virtualkeyboard index fff873b..21dd465 100755 --- a/scripts/speedwm-virtualkeyboard +++ b/scripts/speedwm-virtualkeyboard @@ -23,7 +23,7 @@ if [ "$HAVE_GRID" = "true" ]; then GRIDARG="-g" fi -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" EMOJILIST() { diff --git a/scripts/speedwm-winnav b/scripts/speedwm-winnav index 0949452..f99f170 100755 --- a/scripts/speedwm-winnav +++ b/scripts/speedwm-winnav @@ -43,7 +43,7 @@ case "$RUNLAUNCHER" in "") RUNLAUNCHER=dmenu ;; esac -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" DOTDIR=$HOME/.config/speedwm-de/winnav POSITION="bottom" # top, bottom, center (your $RUNLAUNCHER must support center for this to work) diff --git a/scripts/speedwm_run b/scripts/speedwm_run index 82c3c9f..b29439b 100755 --- a/scripts/speedwm_run +++ b/scripts/speedwm_run @@ -3,7 +3,7 @@ # External script which starts speedwm! # https://speedie.gq/speedwm for instructions and usage! -BINDIR="$(dirname $(command -v status))/" +BINDIR="$(dirname $(command -v speedwm_status))/" ARGS=$1 # No second argument is supported