From 568a29434874f26356c17746f98116e6edbd3dc21ba5e6b1135e207b081023cc Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 22 Jun 2016 08:33:34 +0000
Subject: [PATCH] boo#985971

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-filesystem?expand=0&rev=59
---
 texlive-filesystem.changes |  5 +++++
 update.texlive             | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/texlive-filesystem.changes b/texlive-filesystem.changes
index d2a175d..ea22291 100644
--- a/texlive-filesystem.changes
+++ b/texlive-filesystem.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 22 08:31:55 UTC 2016 - werner@suse.de
+
+- Add some typos in update script (boo#985971) 
+
 -------------------------------------------------------------------
 Mon Jun 20 07:54:36 UTC 2016 - werner@suse.de
 
diff --git a/update.texlive b/update.texlive
index 88f2827..e40ddd0 100644
--- a/update.texlive
+++ b/update.texlive
@@ -125,7 +125,6 @@ if test -z "$cnf_llua" ; then
 	base="${old##*/}"
 	path="${old%/*}"
 	if test -d ${TEXMFSYSCONFIG}${path#$TEXMFDIST}; then
-	    cnf_llua="${TEXMFSYSCONFIG}${path#$TEXMFDIST}/$base"
 	    if test -e "$cnf_llua" ; then
 		rm -f "$old"
 	    else
@@ -134,6 +133,8 @@ if test -z "$cnf_llua" ; then
 	    ln -sf "$cnf_llua" "$old"
 	fi
     fi
+    mktexlsr $TEXMFSYSCONFIG < /dev/null 1>&4 2>&4
+    cnf_llua=$(TEXMF=$TEXMFSYSCONFIG kpsewhich language.dat.lua 2> /dev/null)
 fi
 
 if test -n "${cnf_ldat}" -a -n "${cnf_ldef}" -a -n "${cnf_llua}" ; then
@@ -154,6 +155,7 @@ if test -n "${cnf_ldat}" -a -n "${cnf_ldef}" -a -n "${cnf_llua}" ; then
     # Handle hyphens
     #
     for run in /var/run/texlive/run-hyphen* ; do
+	test -e "$run" || break
 	tmp=${cnf_ldat}.$RANDOM
 	set -C
 	echo "% Generated by ${TEXMFDIST}/texconfig/update on $(date)" > $tmp
@@ -235,7 +237,7 @@ if test -n "${cnf_ldat}" -a -n "${cnf_ldef}" -a -n "${cnf_llua}" ; then
     then
 	> /var/run/texlive/run-fmtutil.language
     fi
-    if test $omd5llua = 0 -o \( $md5llua != $omd5lua -o "$md5_nt_llua" != "yes" \)
+    if test $omd5llua = 0 -o \( $md5llua != $omd5llua -o "$md5_nt_llua" != "yes" \)
     then
 	> /var/run/texlive/run-fmtutil.language
     fi
@@ -300,7 +302,7 @@ has_formats()
 # Go further
 #
 for run in /var/run/texlive/run-fmtutil* ; do
-    test -e $run || break
+    test -e "$run" || break
     type -p fmtutil-sys &> /dev/null || { echo "${0##*/}: No fmtutil-sys in PATH ... skipping" 1>&2; break; }
     option=""
     test $VERBOSE = true || option="--quiet"
@@ -330,7 +332,7 @@ for run in /var/run/texlive/run-fmtutil* ; do
 	    set -- $(md5sum < ${cnf_llua})
 	    echo $1 > ${md5_llua}
 	    if has_formats ${cnf_llua} ; then
-		test $VERBOSE = true && echo -en "\r[ ]Handle language.def setups."
+		test $VERBOSE = true && echo -en "\r[ ]Handle language.dat.lua setups."
 		fmtutil-sys ${option:+$option} --byhyphen ${cnf_llua} < /dev/null 1>&4 2>&4
 		let rc+=$?
 		test $VERBOSE = true && echo
@@ -356,7 +358,7 @@ for run in /var/run/texlive/run-fmtutil* ; do
 done
 
 for run in /var/run/texlive/run-updmap* ; do
-    test -e $run || break
+    test -e "$run" || break
     type -p updmap-sys  &> /dev/null || { echo "${0##*/}: No updmap-sys in PATH ... skipping" 1>&2; break; }
     test -e "$cnf_umap" || break
     test $VERBOSE = true && echo -en "\r[ ]Updating TeX font mappings."
@@ -397,7 +399,7 @@ for run in /var/run/texlive/run-updmap* ; do
 done
 
 for run in /var/run/texlive/sync-updmap* ; do
-    test -e $run || break
+    test -e "$run" || break
     type -p updmap-sys  &> /dev/null || break
     test -e "$cnf_umap" || break
     test $VERBOSE = true && echo -en "\r[ ]Updating TeX font mappings."
@@ -531,9 +533,10 @@ if type -p lpoptions &>/dev/null && lpstat -r &>/dev/null ; then
 	    set -- $line
 	    shift
 	    cur=0
+	    reg='?(\*)@(+([0-9])|+([0-9])x+([0-9]))dpi'
 	    while test -n "$1" ; do
 		case "$1" in
-		?(\*)@(+([0-9])|+([0-9])x+([0-9]))dpi)
+		${reg})
 		    cur=${1%%+([[:alpha:]])}
 		esac
 		cur="${cur#\*}"
@@ -555,7 +558,7 @@ if type -p lpoptions &>/dev/null && lpstat -r &>/dev/null ; then
 	    done
 	    ;;
 	esac
-    done < <(lpoptions -l 2> /dev/null)
+    done < <(lpoptions -l < /dev/null 2> /dev/null)
     shopt -u extglob
     lp="lp|${dev}-$(echo ${size}-auto-${color}-${dpi}|tr '[:upper:]' '[:lower:]')"
 elif test -r /etc/printcap -a -d /var/lib/apsfilter/ ; then