diff --git a/i38.sh b/i38.sh index 2f7691d..f31853f 100755 --- a/i38.sh +++ b/i38.sh @@ -474,16 +474,6 @@ terminal_command() { fi } -screen_reader_command() { - local screenReaderPath="$1" - - if [[ "${screenReaderPath##*/}" == "cthulhu" ]]; then - printf 'env ORC_CODE=backup %s' "$screenReaderPath" - else - printf '%s' "$screenReaderPath" - fi -} - load_config() { # Load existing configuration if available if [[ -f "$configFile" ]]; then @@ -1056,7 +1046,7 @@ if [[ -z "$dex" ]]; then fi fi if [[ $dex -eq 0 ]] && [[ "$screenReader" != "none" ]] && [[ -n "$screenReader" ]]; then - dex -t "${XDG_CONFIG_HOME:-${HOME}/.config}/autostart" -c "$(screen_reader_command "$screenReader")" + dex -t "${XDG_CONFIG_HOME:-${HOME}/.config}/autostart" -c "$screenReader" fi if [[ -z "$batteryAlert" ]]; then if command -v acpi &> /dev/null ; then @@ -1197,7 +1187,6 @@ if [[ $configLoaded -eq 0 || $configChanged -eq 1 ]]; then fi terminalExec="$(terminal_command "$terminalEmulator")" -screenReaderExec="$(screen_reader_command "$screenReader")" if [[ -d "${i3Path}" ]]; then yesno "This will replace your existing configuration at ${i3Path}. Do you want to continue?" || exit 0 @@ -1557,7 +1546,7 @@ bindsym Mod1+Shift+r exec --no-startup-id ${i3Path}/scripts/slideshow_record_tog bindsym apostrophe exec --no-startup-id ${i3Path}/scripts/window_list.sh, mode "default" $(if command -v cthulhu &> /dev/null; then echo "# Restart Cthulhu" - echo "bindsym Shift+c exec env ORC_CODE=backup $(command -v cthulhu) --replace, mode \"default\"" + echo "bindsym Shift+c exec $(command -v cthulhu) --replace, mode \"default\"" fi) $(if command -v orca &> /dev/null; then echo "# Restart Orca" @@ -1654,7 +1643,7 @@ else echo 'exec --no-startup-id x11bell play -nqV0 synth .1 sq norm -12' fi if [[ "$screenReader" != "none" ]] && [[ -n "$screenReader" ]]; then - echo "exec $screenReaderExec" + echo "exec $screenReader" fi fi) diff --git a/scripts/toggle_screenreader.sh b/scripts/toggle_screenreader.sh index 7e0e6ba..4755479 100755 --- a/scripts/toggle_screenreader.sh +++ b/scripts/toggle_screenreader.sh @@ -97,7 +97,7 @@ if [ -n "$result" ]; then if [ "$selectedReader" = "orca" ]; then orca & else - ORC_CODE=backup cthulhu & + cthulhu & fi fi