Preparing for new cthulhu release. If you are not a tester, and have not replaced the old version of cthulhu as your screen reader, you should stay on the master branch.
This commit is contained in:
1 parent
25bb8fdd09
commit
6c793f530a
2 files changed
+4
-15
No files matched your search
@@ -474,16 +474,6 @@ terminal_command() {
|
|||||||
fi
|
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_config() {
|
||||||
# Load existing configuration if available
|
# Load existing configuration if available
|
||||||
if [[ -f "$configFile" ]]; then
|
if [[ -f "$configFile" ]]; then
|
||||||
@@ -1056,7 +1046,7 @@ if [[ -z "$dex" ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ $dex -eq 0 ]] && [[ "$screenReader" != "none" ]] && [[ -n "$screenReader" ]]; then
|
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
|
fi
|
||||||
if [[ -z "$batteryAlert" ]]; then
|
if [[ -z "$batteryAlert" ]]; then
|
||||||
if command -v acpi &> /dev/null ; then
|
if command -v acpi &> /dev/null ; then
|
||||||
@@ -1197,7 +1187,6 @@ if [[ $configLoaded -eq 0 || $configChanged -eq 1 ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
terminalExec="$(terminal_command "$terminalEmulator")"
|
terminalExec="$(terminal_command "$terminalEmulator")"
|
||||||
screenReaderExec="$(screen_reader_command "$screenReader")"
|
|
||||||
|
|
||||||
if [[ -d "${i3Path}" ]]; then
|
if [[ -d "${i3Path}" ]]; then
|
||||||
yesno "This will replace your existing configuration at ${i3Path}. Do you want to continue?" || exit 0
|
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"
|
bindsym apostrophe exec --no-startup-id ${i3Path}/scripts/window_list.sh, mode "default"
|
||||||
$(if command -v cthulhu &> /dev/null; then
|
$(if command -v cthulhu &> /dev/null; then
|
||||||
echo "# Restart Cthulhu"
|
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)
|
fi)
|
||||||
$(if command -v orca &> /dev/null; then
|
$(if command -v orca &> /dev/null; then
|
||||||
echo "# Restart Orca"
|
echo "# Restart Orca"
|
||||||
@@ -1654,7 +1643,7 @@ else
|
|||||||
echo 'exec --no-startup-id x11bell play -nqV0 synth .1 sq norm -12'
|
echo 'exec --no-startup-id x11bell play -nqV0 synth .1 sq norm -12'
|
||||||
fi
|
fi
|
||||||
if [[ "$screenReader" != "none" ]] && [[ -n "$screenReader" ]]; then
|
if [[ "$screenReader" != "none" ]] && [[ -n "$screenReader" ]]; then
|
||||||
echo "exec $screenReaderExec"
|
echo "exec $screenReader"
|
||||||
fi
|
fi
|
||||||
fi)
|
fi)
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ if [ -n "$result" ]; then
|
|||||||
if [ "$selectedReader" = "orca" ]; then
|
if [ "$selectedReader" = "orca" ]; then
|
||||||
orca &
|
orca &
|
||||||
else
|
else
|
||||||
ORC_CODE=backup cthulhu &
|
cthulhu &
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user