From d0c883fc0dbc64a6815aa8a03a9d11b28ccd8ded Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 13 Feb 2017 13:18:14 +0100 Subject: [PATCH 01/20] Update spell_check.py --- src/fenrir/commands/commands/spell_check.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/fenrir/commands/commands/spell_check.py b/src/fenrir/commands/commands/spell_check.py index 7d37150a..2497c856 100644 --- a/src/fenrir/commands/commands/spell_check.py +++ b/src/fenrir/commands/commands/spell_check.py @@ -25,6 +25,9 @@ class command(): def getDescription(self): return 'checks the spelling of the current word' def updateSpellLanguage(self): + if not initialized: + self.env['runtime']['outputManager'].presentText('pychant is not installed', interrupt=True) + return self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')) self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') From 8acba5e053e513a966a48f3e770d01d47b6ca9b1 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 13 Feb 2017 13:20:18 +0100 Subject: [PATCH 02/20] Update 62000-spell_check.py --- src/fenrir/commands/onInput/62000-spell_check.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fenrir/commands/onInput/62000-spell_check.py b/src/fenrir/commands/onInput/62000-spell_check.py index c0fd4a4c..ee78e8f6 100644 --- a/src/fenrir/commands/onInput/62000-spell_check.py +++ b/src/fenrir/commands/onInput/62000-spell_check.py @@ -28,12 +28,15 @@ class command(): return 'No Description found' def updateSpellLanguage(self): + if not initialized: + self.env['runtime']['outputManager'].presentText('pychant is not installed', interrupt=True) + return self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')) self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') - + def run(self): if not initialized: - return + return if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoSpellCheck'): return if self.env['runtime']['inputManager'].noKeyPressed(): @@ -42,7 +45,7 @@ class command(): try: self.updateSpellLanguage() except: - return + return # just when horizontal cursor move worddetection is needed if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): From 5ed4e62ff75d58eb424481b9a435ba4894f6636b Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 13 Feb 2017 13:21:27 +0100 Subject: [PATCH 03/20] change shellbang to /usr/bin/env --- src/fenrir/fenrir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index 2cd48ac8..fce4baac 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -1,4 +1,4 @@ -#!/bin/env python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Fenrir TTY screen reader From ed4ba21ee1df84f546f120fa9cdc1e523809afbb Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 13 Feb 2017 13:22:04 +0100 Subject: [PATCH 04/20] Update fenrir-daemon --- src/fenrir/fenrir-daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index b66b331b..41b3bc27 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -1,4 +1,4 @@ -#!/bin/env python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Fenrir TTY screen reader From 7ee97af1ae6407259aaa5e9388834b354c921cec Mon Sep 17 00:00:00 2001 From: chrys Date: Mon, 13 Feb 2017 20:55:57 +0100 Subject: [PATCH 05/20] speed up paste --- src/fenrir/screenDriver/vcsaDriver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index f0d4751b..d05b233a 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -35,7 +35,7 @@ class driver(): with open(useScreen, 'w') as fd: for c in text: fcntl.ioctl(fd, termios.TIOCSTI, c) - time.sleep(0.005) + time.sleep(0.0005) def getCurrApplication(self): apps = [] From 728adedbe31350fe306ac7e56bd6b5d89d781705 Mon Sep 17 00:00:00 2001 From: chrys Date: Mon, 13 Feb 2017 21:38:57 +0100 Subject: [PATCH 06/20] remove unneded delay --- src/fenrir/screenDriver/vcsaDriver.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index d05b233a..7184af24 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -35,7 +35,6 @@ class driver(): with open(useScreen, 'w') as fd: for c in text: fcntl.ioctl(fd, termios.TIOCSTI, c) - time.sleep(0.0005) def getCurrApplication(self): apps = [] From e31688718df6fcd580f87b93b23039048b24ef32 Mon Sep 17 00:00:00 2001 From: chrys Date: Mon, 13 Feb 2017 21:42:31 +0100 Subject: [PATCH 07/20] add recommendation about python-evdev in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 868b50d5..a4f8adef 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This software is licensed under the LGPL v3 . # Features, Drivers, Extras # Input Drivers: - "evdevDriver" input driver for linux evdev - - python-evdev + - python-evdev >=0.6.3 - loaded uinput kernel module - ReadWrite permission - /dev/input @@ -41,7 +41,7 @@ This software is licensed under the LGPL v3 . - "genericDriver" sound driver for sound as subprocess: - sox - "gstreamerDriver" sound driver for gstreamer - - gstreamer 1.x + - gstreamer >=1.0 - GLib - "dummyDriver" sound driver for debugging From 1ab82e6aeeead3694ae9b368d25db0cb65765462 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 14 Feb 2017 00:51:53 +0100 Subject: [PATCH 08/20] add load-module module-switch-on-connect to root config --- tools/configure_pulse.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/configure_pulse.sh b/tools/configure_pulse.sh index fbd382fe..f39162bd 100755 --- a/tools/configure_pulse.sh +++ b/tools/configure_pulse.sh @@ -11,6 +11,7 @@ if [ -f "$xdgPath/pulse/default.pa" ]; then read -p "This will replace the current file located at $xdgPath/pulse/default.pa, press enter to continue or control+c to abort. " continue fi echo '.include /etc/pulse/default.pa +load-module module-switch-on-connect load-module module-native-protocol-unix auth-anonymous=1 socket=/tmp/pulse.sock' > $xdgPath/pulse/default.pa echo "If you have not yet done so, please run this script as root to write the client.conf file." else From 18cb390418b9e30eb206ac8bc08ffc88421ab962 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 09:16:13 +0100 Subject: [PATCH 09/20] Update known bugs.txt --- known bugs.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/known bugs.txt b/known bugs.txt index ddce00f3..03ef31c4 100644 --- a/known bugs.txt +++ b/known bugs.txt @@ -1,7 +1,13 @@ Known Bugs (Problems with the logic ): +- fenrir crashes on device unplug (remove device graceful) +- no autodetection of X if you start without GUI and use startx manual - word echo triggers twice if there are two spaces after an word and you arrow over them - spellcheck triggers twice if there are two spaces after an word and you arrow over them Glitches (improve diff results): - For example, in screen, it just tells me bell in window, but doesn't tell me which one. (southernprince) - alpine seems to have problems (southernprince) + +Questions: +- what is the correct codepage for cyrillic +- cyrillic From cfa8195ee83528018725d39ddda4c92a976bd9e9 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 09:48:17 +0100 Subject: [PATCH 10/20] Update install.sh --- install.sh | 65 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/install.sh b/install.sh index f64706a0..addb1906 100755 --- a/install.sh +++ b/install.sh @@ -1,24 +1,63 @@ #!/bin/bash #Basic install script for fenrir. read -p "This will install fenrir. Press ctrl+c to cancil, or enter to continue." continue -install -m755 -d /opt/fenrir -install -m755 -d /usr/share/fenrir/scripts -install -m755 -d /usr/share/fenrir/tools -install -m755 -d /etc/fenrir/punctuation -install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf -install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf -install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf -install -d /usr/share/sounds/fenrir -install -m644 -D "autostart/systemd/fenrir.service" /usr/lib/systemd/system/fenrir.service +# fenrir main application +install -m755 -d /opt/fenrir cp -a src/fenrir/* /opt/fenrir -cp -a config/scripts/* /usr/share/fenrir/scripts -cp -a config/punctuation/* /etc/fenrir/punctuation -cp -a config/sound/* /usr/share/sounds/fenrir +install -m644 -D "autostart/systemd/fenrir.service" /usr/lib/systemd/system/fenrir.service +ln -s /opt/fenrir/fenrir-daemon /usr/bin/fenrir + +# tools +install -m755 -d /usr/share/fenrir/tools cp -a tools/* /usr/share/fenrir/tools -ln -s /opt/fenrir/fenrir-daemon /usr/bin/fenrir +# scripts +install -m755 -d /usr/share/fenrir/scripts +cp -a "config/scripts/wlan__-__key_y.sh" /usr/share/fenrir/scripts/ + + +install -m755 -d /etc/fenrir/punctuation +cp -a config/punctuation/* /etc/fenrir/punctuation + +# sound +install -d /usr/share/sounds/fenrir +cp -a config/sound/default /usr/share/sounds/fenrir/default +cp -a config/sound/default-wav /usr/share/sounds/fenrir/default-wav +cp -a config/sound/template /usr/share/sounds/fenrir/template + +# config +if [ -f "/etc/fenrir/keyboard/desktop.conf" ]; then + echo "Do you want overwrite the desktop keyboard layout? (y/n)" + read yn + if [ $yn = "Y" -o $yn = "y"]; + then + install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf + fi +fi + +if [ -f "/etc/fenrir/keyboard/laptop.conf" ]; then + echo "Do you want overwrite the laptop keyboard layout? (y/n)" + read yn + if [ $yn = "Y" -o $yn = "y"]; + then + install -m644 -D "config/keyboard/laptop.conf" /etc/fenrir/keyboard/laptop.conf + fi +fi +if [ -f "config/settings/settings.conf" ]; then + echo "Do you want overwrite your current settings? (y/n)" + read yn + if [ $yn = "Y" -o $yn = "y"]; + then + install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf + fi +fi + + +# end message cat << EOF +To test fenrir +sudo systemctl start fenrir To have fenrir start at boot: sudo systemctl enable fenrir Pulseaudio users may want to run From 5b94d2700e20f28ca304b7f846b35b617b7a4781 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 09:54:33 +0100 Subject: [PATCH 11/20] Update install.sh --- install.sh | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/install.sh b/install.sh index addb1906..0c61c84a 100755 --- a/install.sh +++ b/install.sh @@ -16,7 +16,11 @@ cp -a tools/* /usr/share/fenrir/tools install -m755 -d /usr/share/fenrir/scripts cp -a "config/scripts/wlan__-__key_y.sh" /usr/share/fenrir/scripts/ +# keyboard +install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf +install -m644 -D "config/keyboard/laptop.conf" /etc/fenrir/keyboard/laptop.conf +# punctuation install -m755 -d /etc/fenrir/punctuation cp -a config/punctuation/* /etc/fenrir/punctuation @@ -27,29 +31,14 @@ cp -a config/sound/default-wav /usr/share/sounds/fenrir/default-wav cp -a config/sound/template /usr/share/sounds/fenrir/template # config -if [ -f "/etc/fenrir/keyboard/desktop.conf" ]; then - echo "Do you want overwrite the desktop keyboard layout? (y/n)" - read yn - if [ $yn = "Y" -o $yn = "y"]; - then - install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf - fi -fi - -if [ -f "/etc/fenrir/keyboard/laptop.conf" ]; then - echo "Do you want overwrite the laptop keyboard layout? (y/n)" - read yn - if [ $yn = "Y" -o $yn = "y"]; - then - install -m644 -D "config/keyboard/laptop.conf" /etc/fenrir/keyboard/laptop.conf - fi -fi -if [ -f "config/settings/settings.conf" ]; then +if [ -f "/etc/fenrir/settings/settings.conf" ]; then echo "Do you want overwrite your current settings? (y/n)" read yn - if [ $yn = "Y" -o $yn = "y"]; - then + if [ $yn = "Y" -o $yn = "y"]; then + mv /etc/fenrir/settings/settings.conf /etc/fenrir/settings/settings.conf.bak install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf + else + install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf.current fi fi From 79ee076465d0b179eade09900f0fc64175ac09c1 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 10:04:22 +0100 Subject: [PATCH 12/20] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a4f8adef..4854061b 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ This software is licensed under the LGPL v3 . # Requirements (core) - linux (currently only screen and input drivers available for that) - python3 >= 3.3 +- python-configargparse - screen, input, speech, sound or braille drivers see "Features, Drivers, Extras". # Features, Drivers, Extras @@ -59,7 +60,12 @@ This software is licensed under the LGPL v3 . You can just run the following as root: cd src/fenrir-package/ sudo ./fenrir -Settings "settings.conf" is located in the "config" directory. +Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir. +To install it use the "install.sh" in the root folder of the git. +sudo ./install.sh +or remove +sudo ./deinstall.sh + Take care that the used drivers in the config matching your installed drivers. By default it uses: - sound driver: genericDriver (via sox, could configured in settings.conf) From 50da2355341b83fa0eda67d1b65469c7162433f7 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 10:07:42 +0100 Subject: [PATCH 13/20] Update README.md --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4854061b..befcab52 100644 --- a/README.md +++ b/README.md @@ -55,17 +55,12 @@ This software is licensed under the LGPL v3 . # installation - Archlinux: PKGBUILD in AUR -- install.sh (there is currently no uninstall) -- run from git: +- Manual: run install.sh and uninstall.sh as root +- you also can just run it from git without installation: You can just run the following as root: cd src/fenrir-package/ sudo ./fenrir Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir. -To install it use the "install.sh" in the root folder of the git. -sudo ./install.sh -or remove -sudo ./deinstall.sh - Take care that the used drivers in the config matching your installed drivers. By default it uses: - sound driver: genericDriver (via sox, could configured in settings.conf) From 0604aeb773dda56bf8a1f0a7bd7e9b4c6076e05d Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 17 Feb 2017 10:11:00 +0100 Subject: [PATCH 14/20] Update and rename deinstall.sh to uninstall.sh --- deinstall.sh => uninstall.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename deinstall.sh => uninstall.sh (74%) diff --git a/deinstall.sh b/uninstall.sh similarity index 74% rename from deinstall.sh rename to uninstall.sh index d72f9b5a..7fa6ed26 100644 --- a/deinstall.sh +++ b/uninstall.sh @@ -4,13 +4,19 @@ cat << EOF fenrir is going to remove. every script and settings are lost. EOF -read -p "This will remove fenrir and settings. Press ctrl+c to cancil, or enter to continue." continue + +# ask +read -p "This will remove fenrir and settings. Press ctrl+c to cancel, or enter to continue." continue + +# do it unlink /usr/bin/fenrir rm -r /opt/fenrir rm -r /usr/share/fenrir rm -r /etc/fenrir rm -r /usr/share/sounds/fenrir +rm /usr/lib/systemd/system/fenrir.service +# success message cat << EOF fenrir is removed EOF From 6605a80ac740faa2e13028a59943fa667df6b0bf Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 19 Feb 2017 14:48:07 +0100 Subject: [PATCH 15/20] fix install script --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0c61c84a..ab018793 100755 --- a/install.sh +++ b/install.sh @@ -34,7 +34,7 @@ cp -a config/sound/template /usr/share/sounds/fenrir/template if [ -f "/etc/fenrir/settings/settings.conf" ]; then echo "Do you want overwrite your current settings? (y/n)" read yn - if [ $yn = "Y" -o $yn = "y"]; then + if [ $yn = "Y" -o $yn = "y" ]; then mv /etc/fenrir/settings/settings.conf /etc/fenrir/settings/settings.conf.bak install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf else From a7f30a5014194a1c59ad1f061d61c3bbd9930721 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 19 Feb 2017 15:11:53 +0100 Subject: [PATCH 16/20] fix comments --- install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index ab018793..0123a746 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash #Basic install script for fenrir. -read -p "This will install fenrir. Press ctrl+c to cancil, or enter to continue." continue +read -p "This will install fenrir. Press ctrl+c to cancel, or enter to continue." continue # fenrir main application install -m755 -d /opt/fenrir @@ -45,10 +45,15 @@ fi # end message cat << EOF +Installation completed. +install path:/opt/fenrir +settings path:/etc/fenrir + To test fenrir sudo systemctl start fenrir To have fenrir start at boot: sudo systemctl enable fenrir + Pulseaudio users may want to run /usr/share/fenrir/tools/configure-pulseaudio once as their user account and once as root. From dd7bc412f8d228f132fb23385a2fd9054c49c9aa Mon Sep 17 00:00:00 2001 From: Rob Whyte Date: Mon, 20 Feb 2017 12:17:23 +1100 Subject: [PATCH 17/20] Fixed spelling and grammatical errors --- TODO v2.0 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TODO v2.0 b/TODO v2.0 index 941c50f6..d517832f 100644 --- a/TODO v2.0 +++ b/TODO v2.0 @@ -3,13 +3,13 @@ ToDo list for Fenrir Version 2.0 General: - implement onScreenUpdate commands read highlighted text mode -- translateable (easy for contribute) +- translateable (easy for contribution) http://www.supernifty.org/blog/2011/09/16/python-localization-made-easy/ - be more event based (vcsa sets POLLPRI) http://scotdoyle.com/python-epoll-howto.html - try to make it more asynchronus - multpible threads -- leave revew on typing +- leave review on typing - implement commands attributes_curr_char @@ -28,7 +28,7 @@ Braille Support: print cursor in textmode command toggle used cursor (in manual brailleFocusMode) capture input from braile - make routing keys assignable in keyboard + make routing keys assignable by keyboard make brailleTable configurable pkg-config --variable=tablesdir liblouis http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html @@ -40,21 +40,21 @@ Driver: - implement PTY Screen driver (to use gnome-terminal and other terminal emulators) https://docs.python.org/3.2/library/pty.html - implement PTY Input driver -- ATK input driver (dont grab on graphical interface) +- ATK input driver (don't grab on graphical interface) - implement speechdriver generic -- implement autodetection of plugged and removed input devices (python-pyudev) for evdev driver +- implement autodetection of plugged and unplugged input devices (python-pyudev) for evdev driver http://askubuntu.com/questions/508236/how-can-i-run-code-whenever-a-usb-device-is-unplugged-without-requiring-root - try to autodetect encoding https://stackoverflow.com/questions/6396659/how-do-you-get-the-encoding-of-the-terminal-from-within-a-python-script Settings: -- configuration should be overwriteable with parameter and alternative paths +- configuration should be overwritable with parameter and alternative paths - write settings - menue for settings configuration #storm Application Profiles - reimplement process detection without subprocessing -- reuse new porcess detection code for X11 detection +- reuse new process detection code for X11 detection - fenrir is not able to detect the current application inside of screen. ps -e -H -o pid,pgrp,ppid,tty,cmd http://stackoverflow.com/questions/24861351/how-to-detect-if-python-script-is-being-run-as-a-background-process/24862213 From 0cf57a5373d6eda8e64cdc9c6d6b5937fe57ef0f Mon Sep 17 00:00:00 2001 From: Rob Whyte Date: Mon, 20 Feb 2017 12:21:30 +1100 Subject: [PATCH 18/20] Fixed some spelling and grammatical errors in README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index befcab52..a012da2e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Fenrir -An TTY screenreader for Linux. -In theorie its not limited to linux. but i currently only provide drivers for that because I do not have an ohter system here. If you want to help or write drivers to make it work on other systems, just let me know. +A TTY screenreader for Linux. +In theory it's not just limited to Linux. but i currently only provide drivers for that since I do not have another system here. If you want to help or write drivers to make it work on other systems, just let me know. This software is licensed under the LGPL v3 . # Requirements (core) @@ -56,11 +56,11 @@ This software is licensed under the LGPL v3 . # installation - Archlinux: PKGBUILD in AUR - Manual: run install.sh and uninstall.sh as root -- you also can just run it from git without installation: +- you also can just run it from Git without installing: You can just run the following as root: cd src/fenrir-package/ sudo ./fenrir -Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir. +Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir/settings. Take care that the used drivers in the config matching your installed drivers. By default it uses: - sound driver: genericDriver (via sox, could configured in settings.conf) From c68a5ea34c585ca7ce32927acc43ca1144ad289c Mon Sep 17 00:00:00 2001 From: Rob Whyte Date: Mon, 20 Feb 2017 12:27:26 +1100 Subject: [PATCH 19/20] Fixed some capitalisation, slight wording and an echo stating name of settings.conf.bak --- install.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index 0123a746..8595ee3f 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -#Basic install script for fenrir. -read -p "This will install fenrir. Press ctrl+c to cancel, or enter to continue." continue +#Basic install script for Fenrir. +read -p "This will install Fenrir. Press ctrl+c to cancel, or enter to continue." continue # fenrir main application install -m755 -d /opt/fenrir @@ -32,10 +32,11 @@ cp -a config/sound/template /usr/share/sounds/fenrir/template # config if [ -f "/etc/fenrir/settings/settings.conf" ]; then - echo "Do you want overwrite your current settings? (y/n)" + echo "Do you want to overwrite your current global settings? (y/n)" read yn if [ $yn = "Y" -o $yn = "y" ]; then mv /etc/fenrir/settings/settings.conf /etc/fenrir/settings/settings.conf.bak + echo "Your old settings.conf has been backed up to settings.conf.bak." install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf else install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf.current @@ -45,16 +46,16 @@ fi # end message cat << EOF -Installation completed. +Installation complete. install path:/opt/fenrir settings path:/etc/fenrir -To test fenrir +To test Fenrir sudo systemctl start fenrir -To have fenrir start at boot: +To have Fenrir start on system boot: sudo systemctl enable fenrir Pulseaudio users may want to run /usr/share/fenrir/tools/configure-pulseaudio -once as their user account and once as root. +once as their user account, then once as root. EOF From bb8f57b7a19bc0c38ff858dea14f7865d4becac1 Mon Sep 17 00:00:00 2001 From: Rob Whyte Date: Mon, 20 Feb 2017 12:38:32 +1100 Subject: [PATCH 20/20] Fixed spelling, some grammar and capitalisation --- config/settings/settings.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/settings/settings.conf b/config/settings/settings.conf index ef7ff187..dccf3114 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -13,19 +13,19 @@ driver=genericDriver # For the current user. theme=default -# Sound volume controls how loud the sounds for your chosen soundpack are. +# Sound volume controls how loud the sounds for your selected soundpack are. # 0 is quietest, 1.0 is loudest. volume=1.0 # shell commands for generic sound driver -# the folowing variable are substituded +# the folowing variable are substituted # fenrirVolume = the current volume setting # fenrirSoundFile = the soundfile for an soundicon # fenrirFrequence = the frequence to play # fenrirDuration = the duration of the frequence -# the following command is used for play a soundfile +# the following command is used to play a soundfile genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile -#the following command is used for generating a frequence beep +#the following command is used to generate a frequency beep genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence [speech] @@ -37,7 +37,7 @@ driver=speechdDriver #driver=espeakDriver -# The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest. +# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest. rate=0.65 # Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest. @@ -49,15 +49,15 @@ capitalPitch=0.9 volume=1.0 # Module is used for speech-dispatcher, to select the speech module you want to use. -# Consult speech-dispatcher's configuration and help ti find out which modules are available. +# Consult speech-dispatcher's configuration and help Fenrir find out which modules are available. # The default is espeak. module=espeak # Voice selects the varient you want to use, for example, f5 will use the female voice #5 in espeak, -# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your chosen synthesizer. +# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer. voice= -# Select the language you want fenrir to use. +# Select the language you want Fenrir to use. language=english-us # Read new text as it happens? @@ -105,7 +105,7 @@ autodetectSuspendingScreen=True driver=evdevDriver # filter input devices NOMICE, ALL or a DEVICE NAME device=ALL -# gives fenrir exclusive access to the keyboard and let consume keystrokes. +# gives Fenrir exclusive access to the keyboard and lets it control keystrokes. grabDevices=True ignoreShortcuts=False # the current shortcut layout located in /etc/fenrir/keyboard