Compatibility emacspeak 48.0 (tested on Ubuntu 18.04)

README → README.org

@@ -1,30 +1,32 @@
-This installer builds emacspeak 46.0 with espeak or voxin.
+This installer builds emacspeak 48.0 with espeak or voxin.
 
-Emacs (>=24) must be installed before running this script.
+Emacs (>=25) must be installed before running this script.
 Voxin (>=1.00) is optional and available at:
 http://voxin.oralux.net
 
+* install
 To launch the installer, just type as root in a terminal:
 ./install.sh
 
 The proposed instruction to launch emacspeak will be displayed at the
 end of the script.
 
+* emacs init file 
 In summary, update your emacs init file [1] then start emacs.
 
-For example, if you have installed emacspeak_voxin_install in /home/user1
-directory, the instruction to add at the beginnong of your emacs init
-file [1] is:
+For example, if you have installed emacspeak_voxin_install in the
+/home/user1 directory, the instruction to add at the beginnong of your
+emacs init file [1] is:
 
-(load-file "/home/user1/emacspeak_voxin_install/build/emacspeak-46.0/lisp/emacspeak-setup.el")
+(load-file "/home/user1/emacspeak_voxin_install/build/emacspeak-48.0/lisp/emacspeak-setup.el")
 
 Then emacspeak will use espeak by default.
 
 For using voxin by default, you may set the DTK_PROGRAM variable to
 outloud before calling load-file:
 
 (setenv "DTK_PROGRAM" "outloud")
-(load-file "/home/user1/emacspeak_voxin_install/build/emacspeak-46.0/lisp/emacspeak-setup.el")
+(load-file "/home/user1/emacspeak_voxin_install/build/emacspeak-48.0/lisp/emacspeak-setup.el")
 
 
 Note [1]:

bin/conf.inc

@@ -1,5 +1,5 @@
 PN=emacspeak_voxin_install
-PV=46.0
+PV=48.0
 URL=https://github.com/tvraman/emacspeak/releases/download/$PV/emacspeak-$PV.tar.bz2
 archivesDir=$PWD/archives
 workDir=$PWD/build
@@ -9,8 +9,6 @@ SERVER=outloud
 LOG=$logDir/$PV.log
 TCLX_AUR=https://aur.archlinux.org/cgit/aur.git/snapshot/tclx.tar.gz
 
-EMACS25_DOM_URL="http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/dom.el?h=emacs-25"
-
 ###
 check_distro()
 {
@@ -47,7 +45,7 @@ arch_check_libvoxin() {
 }
 
 arch_check_espeak() {
-    pacman -Q espeak &> /dev/null    
+    pacman -Q espeak || pacman -Q espeak-ng &> /dev/null    
 }
 
 arch_install_dep() {

install.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# 2016-2017, Gilles Casse <gcasse@oralux.org>
+# 2016-2018, Gilles Casse <gcasse@oralux.org>
 #
 
 BASE="$(cd "$(dirname "$0")" && pwd)"
@@ -50,10 +50,10 @@ fi
 
 trap error_msg ERR
 
-echo "initialization; please wait... "
+echo "Initialization; please wait... "
 $install_dep
 
-echo "downloading emacspeak $PV... "
+echo "Downloading emacspeak $PV... "
 mkdir -p $workDir
 cd $workDir
 if [ ! -e "emacspeak-${PV}.tar.bz2" ]; then
@@ -67,17 +67,7 @@ fi
 tar --no-same-owner -jxf emacspeak-${PV}.tar.bz2
 cd emacspeak-${PV}
 
-EMACS_VERSION=$(emacs --version | head -1 | awk '{print $3}')
-case "$EMACS_VERSION" in
-    24*)
-	wget "$EMACS25_DOM_URL" -O lisp/dom.el &>> $LOG
-	;;
-    *) ;;
-esac
-
-patch -p1 < $archivesDir/git_diff_46.0_cef3db579d8c839ca917bd75722427d6fe9d36df.patch
-
-echo "building emacspeak... "
+echo "Building emacspeak... "
 make config &>> $LOG
 make &>> $LOG
 if [ "$voxin_found" = "1" ]; then

uninstall.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 
-source conf.inc
+BASE="$(cd "$(dirname "$0")" && pwd)"
 
-rm -rf emacspeak-$PV install *~
-rm emacspeak-$PV.tar.bz2
+source $BASE/bin/conf.inc
+
+if [ "$(id -u)" != "0" ]; then
+    echo "please run this script as root."
+    exit 0
+fi  
+
+cd $BASE
+
+unset DTK
+$check_libvoxin && DTK='(setenv "DTK_PROGRAM" "outloud")'
+
+rm -rf build log
+
+echo "
+Remove please the following lines from your emacs init file (e.g. in  ~/.emacs ):
+$DTK
+(load-file \"$PWD/lisp/emacspeak-setup.el\")
+"