From f2a6a6b40e984b3042441fc29109cab05e3d0368 Mon Sep 17 00:00:00 2001 From: Moeta Yuko Date: Tue, 18 Jun 2024 15:41:01 +0800 Subject: [PATCH] Replace gojq usages with jq --- .../scripts/color_generation/switchwall.sh | 4 ++-- .config/ags/scripts/grimblast.sh | 19 +++++++++---------- .../ags/scripts/hyprland/workspace_action.sh | 2 +- .config/ags/scripts/record-script.sh | 2 +- .config/ags/scripts/sway/swayToRelativeWs.sh | 4 ++-- .../illogical-impulse-basic/PKGBUILD | 2 -- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.config/ags/scripts/color_generation/switchwall.sh b/.config/ags/scripts/color_generation/switchwall.sh index 6ed5a185f..e2d68cab0 100755 --- a/.config/ags/scripts/color_generation/switchwall.sh +++ b/.config/ags/scripts/color_generation/switchwall.sh @@ -6,9 +6,9 @@ CONFIG_DIR="$XDG_CONFIG_HOME/ags" switch() { imgpath=$1 read scale screenx screeny screensizey < <(hyprctl monitors -j | jq '.[] | select(.focused) | .scale, .x, .y, .height' | xargs) - cursorposx=$(hyprctl cursorpos -j | gojq '.x' 2>/dev/null) || cursorposx=960 + cursorposx=$(hyprctl cursorpos -j | jq '.x' 2>/dev/null) || cursorposx=960 cursorposx=$(bc <<< "scale=0; ($cursorposx - $screenx) * $scale / 1") - cursorposy=$(hyprctl cursorpos -j | gojq '.y' 2>/dev/null) || cursorposy=540 + cursorposy=$(hyprctl cursorpos -j | jq '.y' 2>/dev/null) || cursorposy=540 cursorposy=$(bc <<< "scale=0; ($cursorposy - $screeny) * $scale / 1") cursorposy_inverted=$((screensizey - cursorposy)) diff --git a/.config/ags/scripts/grimblast.sh b/.config/ags/scripts/grimblast.sh index db8bb5069..a5602f24d 100755 --- a/.config/ags/scripts/grimblast.sh +++ b/.config/ags/scripts/grimblast.sh @@ -17,7 +17,6 @@ ## This tool is based on grimshot, with swaymsg commands replaced by their ## hyprctl equivalents. ## https://github.com/swaywm/sway/blob/master/contrib/grimshot -jq=gojq getTargetDirectory() { test -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" @@ -191,14 +190,14 @@ if [ "$ACTION" = "check" ]; then check hyprctl check hyprpicker check wl-copy - check $jq + check jq check notify-send exit elif [ "$SUBJECT" = "active" ]; then wait FOCUSED=$(hyprctl activewindow -j) - GEOM=$(echo "$FOCUSED" | $jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"') - APP_ID=$(echo "$FOCUSED" | $jq -r '.class') + GEOM=$(echo "$FOCUSED" | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"') + APP_ID=$(echo "$FOCUSED" | jq -r '.class') WHAT="$APP_ID window" elif [ "$SUBJECT" = "screen" ]; then wait @@ -207,7 +206,7 @@ elif [ "$SUBJECT" = "screen" ]; then elif [ "$SUBJECT" = "output" ]; then wait GEOM="" - OUTPUT=$(hyprctl monitors -j | $jq -r '.[] | select(.focused == true)' | $jq -r '.name') + OUTPUT=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)' | jq -r '.name') WHAT="$OUTPUT" elif [ "$SUBJECT" = "area" ]; then if [ "$FREEZE" = "yes" ] && [ "$(command -v "hyprpicker")" ] >/dev/null 2>&1; then @@ -218,15 +217,15 @@ elif [ "$SUBJECT" = "area" ]; then # get fade & fadeOut animation and unset it # this removes the black border seen around screenshots - FADE="$(hyprctl -j animations | $jq -jr '.[0][] | select(.name == "fade") | .name, ",", (if .enabled == true then "1" else "0" end), ",", (.speed|floor), ",", .bezier')" - FADEOUT="$(hyprctl -j animations | $jq -jr '.[0][] | select(.name == "fadeOut") | .name, ",", (if .enabled == true then "1" else "0" end), ",", (.speed|floor), ",", .bezier')" + FADE="$(hyprctl -j animations | jq -jr '.[0][] | select(.name == "fade") | .name, ",", (if .enabled == true then "1" else "0" end), ",", (.speed|floor), ",", .bezier')" + FADEOUT="$(hyprctl -j animations | jq -jr '.[0][] | select(.name == "fadeOut") | .name, ",", (if .enabled == true then "1" else "0" end), ",", (.speed|floor), ",", .bezier')" hyprctl keyword animation 'fade,0,1,default' >/dev/null hyprctl keyword animation 'fadeOut,0,1,default' >/dev/null - WORKSPACES="$(hyprctl monitors -j | $jq -r 'map(.activeWorkspace.id)')" - WINDOWS="$(hyprctl clients -j | $jq -r --argjson workspaces "$WORKSPACES" 'map(select([.workspace.id] | inside($workspaces)))')" + WORKSPACES="$(hyprctl monitors -j | jq -r 'map(.activeWorkspace.id)')" + WINDOWS="$(hyprctl clients -j | jq -r --argjson workspaces "$WORKSPACES" 'map(select([.workspace.id] | inside($workspaces)))')" # shellcheck disable=2086 # if we don't split, spaces mess up slurp - GEOM=$(echo "$WINDOWS" | $jq -r '.[] | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"' | slurp $SLURP_ARGS) + GEOM=$(echo "$WINDOWS" | jq -r '.[] | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"' | slurp $SLURP_ARGS) # Check if user exited slurp without selecting the area if [ -z "$GEOM" ]; then diff --git a/.config/ags/scripts/hyprland/workspace_action.sh b/.config/ags/scripts/hyprland/workspace_action.sh index 33f100866..a43badfc8 100755 --- a/.config/ags/scripts/hyprland/workspace_action.sh +++ b/.config/ags/scripts/hyprland/workspace_action.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -hyprctl dispatch "$1" $(((($(hyprctl activeworkspace -j | gojq -r .id) - 1) / 10) * 10 + $2)) +hyprctl dispatch "$1" $(((($(hyprctl activeworkspace -j | jq -r .id) - 1) / 10) * 10 + $2)) diff --git a/.config/ags/scripts/record-script.sh b/.config/ags/scripts/record-script.sh index e7855cff8..f9dd16dc7 100755 --- a/.config/ags/scripts/record-script.sh +++ b/.config/ags/scripts/record-script.sh @@ -7,7 +7,7 @@ getaudiooutput() { pactl list sources | grep 'Name' | grep 'monitor' | cut -d ' ' -f2 } getactivemonitor() { - hyprctl monitors -j | gojq -r '.[] | select(.focused == true) | .name' + hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .name' } mkdir -p "$(xdg-user-dir VIDEOS)" diff --git a/.config/ags/scripts/sway/swayToRelativeWs.sh b/.config/ags/scripts/sway/swayToRelativeWs.sh index c97ebdb93..81e887b79 100755 --- a/.config/ags/scripts/sway/swayToRelativeWs.sh +++ b/.config/ags/scripts/sway/swayToRelativeWs.sh @@ -8,7 +8,7 @@ fi # Get the current workspace number -current=$(swaymsg -t get_workspaces | gojq '.[] | select(.focused==true) | .num') +current=$(swaymsg -t get_workspaces | jq '.[] | select(.focused==true) | .num') # Check if a number was passed as an argument if [[ "$1" =~ ^[+-]?[0-9]+$ ]]; then @@ -25,6 +25,6 @@ fi # Switch to the new workspace if [[ $2 == 'move' ]]; then swaymsg move container to workspace $new_workspace -else +else swaymsg workspace $new_workspace fi diff --git a/arch-packages/illogical-impulse-basic/PKGBUILD b/arch-packages/illogical-impulse-basic/PKGBUILD index 1b1418e17..ac74a3c36 100644 --- a/arch-packages/illogical-impulse-basic/PKGBUILD +++ b/arch-packages/illogical-impulse-basic/PKGBUILD @@ -15,7 +15,6 @@ depends=( rsync wget ripgrep - gojq jq npm meson @@ -23,4 +22,3 @@ depends=( gjs xdg-user-dirs ) -