TEXMFHOME should only be edited if it was changed,

and avoid double $HOME (/home/karl//home/karl/texmf).
use mktexlsr --verbose.
wording fixes.


git-svn-id: svn://tug.org/texlive/trunk@2912 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 16 insertions, 10 deletions

diff --git a/Master/common.sh b/Master/common.sh
index bb2d17e3ce1..e123799703f 100755
--- a/Master/common.sh
+++ b/Master/common.sh
@@ -342,14 +342,18 @@ TEXMFCNF__fix_texmf()
     # if the variable starts with the explicit home of the current user, 
     # replace that with the string '$HOME' as the explicit home of the 
     # current user is most certainly not what we want.
-    HME=`echo "$TEXMFHOME" | sed "s@$HOME/*@@" ` ;
+    HME=`echo "$TEXMFHOME" | sed "s@$HOME/*@@"`
     TEXMFHOME="\$HOME/$HME" 
+    #
+    echo "Setting TEXMFHOME to $TEXMFHOME in $TEXMFCNF_DIR/texmf.cnf... " >&2
+    sed "s@^TEXMFHOME.*@TEXMFHOME=$TEXMFHOME@" $TEXMFCNF_DIR/texmf.cnf \
+      >.sed_tmp.$$
+    cp .sed_tmp.$$ $TEXMFCNF_DIR/texmf.cnf
+    rm -f .sed_tmp.$$
   fi
-  echo "Setting the user texmf home (TEXMFHOME) to \$HOME/$TEXMFHOME in $TEXMFCNF_DIR/texmf.cnf... " >&2
-  sed "s@^TEXMFHOME.*@TEXMFHOME=\$HOME/$TEXMFHOME@" $TEXMFCNF_DIR/texmf.cnf >.sed_tmp.$$
-  cp .sed_tmp.$$ $TEXMFCNF_DIR/texmf.cnf
-  rm .sed_tmp.$$
-  echo Done fixing texmf.cnf. >&2
+  
+  echo Done updating texmf.cnf. >&2
+  echo >&2
 }
 
 
@@ -602,7 +606,7 @@ menu_schemes()
 	    echo $key $name
 	done | pr -t -2 - 
         echo
-        echo "Current scheme: [$selected_scheme]."
+        echo "Current scheme: $selected_scheme."
         echo
         echo '    Press <S> to see collections for this scheme,'
         echo '          <R> to return to main menu, <Q> to quit'
@@ -610,12 +614,14 @@ menu_schemes()
         case $K in 
           Q) exit_on_confirm;;
           R) total_stat; return ;;
-          S) echo "[Collections: $selected_collections]" \
+          S) echo "Collections: $selected_collections" \
              | sed 's/tex_//g' | fmt;;
           *) eval W=\"\$SCHEMES_${K}\"
 	     selected_scheme=$W
 	     scheme_select $W
-	     total_stat; return;;
+	     total_stat
+	     echo "New scheme: $selected_scheme."
+	     return;;
         esac
     done
 }
@@ -1411,7 +1417,7 @@ runsetup()
 
   # Update ls-R before running texconfig, or modes.mf et al. may not be found.
   echo Updating filename database with mktexlsr... >&2
-  $bindir/mktexlsr
+  $bindir/mktexlsr --verbose
 
   echo "Doing post-install jobs from the packages..."
   post_install_jobs