Merge pull request #173 from budlabs/next

2022-05-22 release

Author: budRich

Makefile

@@ -1,4 +1,4 @@
-.PHONY: wiki install-dev install all clean readme uninstall-dev check manpage
+.PHONY: wiki install-dev install uninstall all clean readme uninstall-dev check manpage
 
 default: all
 
@@ -18,7 +18,7 @@ README_LAYOUT  =         \
 	docs/readme_links.md   \
 
 
-install install-dev all clean uninstall-dev check manpage:
+install install-dev all clean uninstall-dev check manpage uninstall:
 	for dir in $(ass_dirs); do
 		$(MAKE) -C "$$dir" $@
 	done

src/i3run/config.mak

@@ -1,7 +1,7 @@
 NAME         := i3run
-VERSION      := 0.2
+VERSION      := 0.2.1
 CREATED      := 2017-04-20
-UPDATED      := 2022-05-21
+UPDATED      := 2022-05-22
 AUTHOR       := budRich
 CONTACT      := https://github.com/budlabs/i3ass
 USAGE        := options

src/i3run/func/focuswindow.sh

@@ -9,16 +9,16 @@ focuswindow(){
   if [[ ${i3list[SUS]} = 1 || ${i3list[TWC]} = "${i3list[AWC]}" ]]; then
     target_container=${i3list[TWC]}
   elif [[ ${i3list[WTN]} = "${i3list[WAN]}" ]]; then
-    target_container=$(i3viswiz "${_criteria[@]}" "${_pass_json[@]}")
+    target_container=$(i3viswiz "${_criteria[@]}")
   elif [[ ${i3list[WTN]} = __i3_scratch ]]; then 
-    target_container=$(i3viswiz --scratchpad "${_criteria[@]}" "${_pass_json[@]}")
+    target_container=$(i3viswiz --scratchpad "${_criteria[@]}")
   fi
 
   : "${target_container:=${i3list[TWC]}}"
 
   [[ $target_container != "${i3list[TWC]}" ]] && {
-    _array=$(i3list --conid "$target_container" "${_pass_json[@]}")
-    _pass_array=("${_o[verbose]:+--verbose}" --array "$_array")
+    _array=$(i3list --conid "$target_container")
+    _pass_array=(${_o[verbose]:+--verbose} --array "$_array")
     eval "$_array"
   }
 

src/i3run/i3run

@@ -10,8 +10,6 @@ main(){
   declare -ag _criteria   # options passed to i3list/i3get/i3viswiz
   declare -A   i3list     # globals array
   declare -g  _msgstring  # passed to i3-msg ( messy() )
-  declare -g  _json       # result of i3-msg -t get_tree
-  declare -ag _pass_json  # helper var for storing --json option
   declare -ag _pass_array # helper var for storing --array option
   declare -ag _command    # command to execute
   declare -g  _array      # result of i3list
@@ -24,10 +22,8 @@ main(){
   [[ -z ${_criteria[*]} ]] \
     && ERX "please specify a criteria"
 
-  _json=$(i3-msg -t get_tree)
-  _pass_json=("${_o[verbose]:+--verbose}" --json "$_json")
-  _array=$(i3list "${_criteria[@]}" "${_pass_json[@]}")
-  _pass_array=("${_o[verbose]:+--verbose}" --array "$_array")
+  _array=$(i3list "${_criteria[@]}")
+  _pass_array=(${_o[verbose]:+--verbose} --array "$_array")
   eval "$_array"
 
   # shellcheck disable=SC2206