From 02fcdf794b3af5ffd0f1376eec7228070a0b2b41 Mon Sep 17 00:00:00 2001 From: Yigid BALABAN Date: Thu, 10 Oct 2024 10:20:47 +0300 Subject: [PATCH] pass $mode to reload, find real path even when sourcing --- _reve.sh | 4 ++-- _reve_states.sh | 2 +- reve.sh | 2 +- utility/nemo/set_wallpaper.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_reve.sh b/_reve.sh index 06afd8d..63e3f80 100644 --- a/_reve.sh +++ b/_reve.sh @@ -7,7 +7,7 @@ reve_installation="$HOME/.local/bin/reve" reve_config="$HOME/.config/reve" -_current_dir=$(realpath "$(dirname "$0")") +_current_dir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") # shellcheck source=_reve_states.sh source "$_current_dir/_reve_states" >&/dev/null (($? == 1)) && source "$_current_dir/_reve_states.sh" @@ -66,7 +66,7 @@ util_run_utility() { } reload() { - util_run_chore "$1" + util_run_chore "$1" "$2" } reload_util() { diff --git a/_reve_states.sh b/_reve_states.sh index 309825a..8418579 100644 --- a/_reve_states.sh +++ b/_reve_states.sh @@ -6,7 +6,7 @@ # reve internal: _reve_states # defines state management API -_current_dir=$(realpath "$(dirname "$0")") +_current_dir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") # shellcheck source=_reve_utils.sh source "$_current_dir/_reve_utils" >&/dev/null (($? == 1)) && source "$_current_dir/_reve_utils.sh" diff --git a/reve.sh b/reve.sh index 862149e..86c9c23 100755 --- a/reve.sh +++ b/reve.sh @@ -10,7 +10,7 @@ in_desktop_mode="" in_reason="" in_chore_name="" -rt_script_dir=$(realpath "$(dirname "$0")") +rt_script_dir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") rt_has_mode_changed=0 rt_current_mode="unset" diff --git a/utility/nemo/set_wallpaper.sh b/utility/nemo/set_wallpaper.sh index 498c72f..87a1826 100755 --- a/utility/nemo/set_wallpaper.sh +++ b/utility/nemo/set_wallpaper.sh @@ -26,4 +26,4 @@ else cp -T "$first" "$bgl" fi -reload mode/swww_single +reload mode/swww_single $mode