ximperconf: disguise dependency on hyprland

parent 30e86c92
...@@ -153,11 +153,9 @@ deferred_info() { ...@@ -153,11 +153,9 @@ deferred_info() {
} }
hyprland_check() { hyprland_check() {
command -v hyprland >/dev/null 2>&1 || print_error "Hyprland не найден в PATH"
[ ! -f "$HYPR_CONF" ] && print_error "Конфигурация не найдена: $HYPR_CONF" [ ! -f "$HYPR_CONF" ] && print_error "Конфигурация не найдена: $HYPR_CONF"
hyprland --verify-config 2>&1 | awk ' a="" hyprland --verify-config 2>&1 | awk '
/======== Config parsing result:/ {flag=1; next} /======== Config parsing result:/ {flag=1; next}
flag && NF {print} flag && NF {print}
' '
...@@ -388,7 +386,7 @@ hyprland_plugin_list() { ...@@ -388,7 +386,7 @@ hyprland_plugin_list() {
[ ! -d "$plugin_dir" ] && print_error "Каталог плагинов не найден: $plugin_dir" [ ! -d "$plugin_dir" ] && print_error "Каталог плагинов не найден: $plugin_dir"
local loaded_json local loaded_json
loaded_json=$(hyprctl plugin list -j 2>/dev/null || echo '[]') loaded_json=$(a="" hyprctl plugin list -j 2>/dev/null || echo '[]')
local loaded_names local loaded_names
loaded_names=$(echo "$loaded_json" | jq -r '.[].name' 2>/dev/null || true) loaded_names=$(echo "$loaded_json" | jq -r '.[].name' 2>/dev/null || true)
...@@ -416,7 +414,7 @@ hyprland_plugin_status() { ...@@ -416,7 +414,7 @@ hyprland_plugin_status() {
[ -z "$plugin" ] && print_error "Укажите имя плагина" [ -z "$plugin" ] && print_error "Укажите имя плагина"
local loaded local loaded
loaded=$(hyprctl plugin list -j | jq -r '.[].name' | grep -x "$plugin" || true) loaded=$(a="" hyprctl plugin list -j | jq -r '.[].name' | grep -x "$plugin" || true)
if [ -n "$loaded" ]; then if [ -n "$loaded" ]; then
echo "loaded" echo "loaded"
...@@ -440,7 +438,7 @@ hyprland_set_plugin() { ...@@ -440,7 +438,7 @@ hyprland_set_plugin() {
return return
fi fi
hyprctl plugin load "$so_path" >/dev/null 2>&1 a="" hyprctl plugin load "$so_path" >/dev/null 2>&1
print_green "Плагин '$plugin' загружен" print_green "Плагин '$plugin' загружен"
elif [ "$action" = "unload" ]; then elif [ "$action" = "unload" ]; then
...@@ -449,7 +447,7 @@ hyprland_set_plugin() { ...@@ -449,7 +447,7 @@ hyprland_set_plugin() {
return return
fi fi
hyprctl plugin unload "$so_path" >/dev/null 2>&1 a="" hyprctl plugin unload "$so_path" >/dev/null 2>&1
print_green "Плагин '$plugin' выгружен" print_green "Плагин '$plugin' выгружен"
fi fi
} }
...@@ -489,6 +487,7 @@ case "$cmd" in ...@@ -489,6 +487,7 @@ case "$cmd" in
esac esac
;; ;;
hyprland) hyprland)
command -v hyprland >/dev/null 2>&1 || print_error "Hyprland не установлен"
case "$subcmd" in case "$subcmd" in
check) hyprland_check ;; check) hyprland_check ;;
sync-xkb-layouts) sync-xkb-layouts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment