[subversion-commit] SVN make-texfontpkg commit + diffs: r937 - make-texfontpkg/trunk/scripts

[Ralf Stubner]

Author: stubner-guest
Date: 2006-02-24 16:43:06 +0000 (Fri, 24 Feb 2006)
New Revision: 937

Modified:
   make-texfontpkg/trunk/scripts/mk-tex-fontpack
Log:
* switch from dh_installtexfonts to dh_installtex
* some clean ups [`...` to $(...) etc]


Modified: make-texfontpkg/trunk/scripts/mk-tex-fontpack
===================================================================
--- make-texfontpkg/trunk/scripts/mk-tex-fontpack	2006-02-24 15:55:32 UTC (rev 936)
+++ make-texfontpkg/trunk/scripts/mk-tex-fontpack	2006-02-24 16:43:06 UTC (rev 937)
@@ -16,13 +16,13 @@
 if [ "$DEBFULLNAME" ] ; then
     name=$DEBFULLNAME
 else
-    name=`awk --field-separator : "/$LOGNAME/ {print \\$5}" /etc/passwd`
+    name=$(awk --field-separator : "/$LOGNAME/ {print \\$5}" /etc/passwd)
 fi
 
 if [ "$DEBEMAIL" ] ; then
     email=$DEBEMAIL
 else
-    email="$LOGNAME@`hostname --fqdn`"
+    email="$LOGNAME@$(hostname --fqdn)"
 fi
 
 # initial values
@@ -32,7 +32,7 @@
 # output usage information
 usage() {
     cat <<EOF
-usage: `basename $0` [options] tds-dir packname
+usage: $(basename $0) [options] tds-dir packname
 
 Valid options:
  -r|--revision <n>  specify revision number <n>
@@ -63,7 +63,7 @@
           ;;
       *)
           if [ $# -eq 2 ]; then
-              tdsdir=`echo $1 | sed  "s|/$||"` 
+              tdsdir=$(echo $1 | sed  "s|/$||") 
               packname="tex-fontpack-$2"
               break
           else
@@ -77,7 +77,7 @@
 
 
 # working directory
-tmpdir=`mktemp -d`
+tmpdir=$(mktemp -d)
 tmproot=$tmpdir/debian/$packname
 mkdir -p $tmproot/usr/share/texmf
 
@@ -86,31 +86,31 @@
 afmfiles=""
 
 echo "Copying files to $tmproot."
-for f in `find $tdsdir -type f` ; do
+for f in $(find $tdsdir -type f) ; do
     # $nn: final location of $f without leading slash
     # $mapfiles: list of .map files
     # $fontfiles, $afmfiles: list of font and .afm files *with path*
     #     relative to TEXMF
     case $f in
         $tdsdir/fonts/map/dvips/*)
-            nn=`echo $f | sed -e "s|$tdsdir|usr/share/texmf|"`
-            mapfiles="$mapfiles `basename $f`"
+            nn=$(echo $f | sed -e "s|$tdsdir|usr/share/texmf|")
+            mapfiles="$mapfiles $(basename $f)"
             ;;
 
         $tdsdir/fonts/type1/*)
-            nn=`echo $f | sed -e "s|$tdsdir/||"`
+            nn=$(echo $f | sed -e "s|$tdsdir/||")
             fontfiles="$fontfiles $nn"
-            nn="usr/share/fonts/type1/$packname/`basename $nn`"
+            nn="usr/share/fonts/type1/$packname/$(basename $nn)"
             ;;
 
         $tdsdir/fonts/afm/*)
-            nn=`echo $f | sed -e "s|$tdsdir/||"`
+            nn=$(echo $f | sed -e "s|$tdsdir/||")
             afmfiles="$afmfiles $nn"
-            nn="usr/share/fonts/type1/$packname/`basename $nn`"
+            nn="usr/share/fonts/type1/$packname/$(basename $nn)"
             ;;
 
         $tdsdir/doc/*)
-            nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
+            nn=$(echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|")
             ;;
 
         # don't include map files at TDS 1.0 location
@@ -119,15 +119,15 @@
             ;;
 
         *)
-            nn=`echo $f | sed -e "s|$tdsdir|usr/share/texmf|"`
+            nn=$(echo $f | sed -e "s|$tdsdir|usr/share/texmf|")
             ;;
     esac
-    mkdir -p `dirname "$tmproot/$nn"`
-    cp -p $f `dirname "$tmproot/$nn"`
+    mkdir -p $(dirname "$tmproot/$nn")
+    cp -p $f $(dirname "$tmproot/$nn")
 done
 
 # configure map files for Debian
-if [ ! "X$mapfiles" = "X" ] ; then
+if [ "$mapfiles" ] ; then
     for m in $mapfiles ; do
         echo "Map $m" >> $tmpdir/debian/$packname.maps
     done
@@ -136,10 +136,10 @@
     exit 0
 fi
 
-if [ ! "X$fontfiles" = "X" ] ; then
+if [ "$fontfiles" ] ; then
     # create links for TeX and X11
     for texmffile in $fontfiles $afmfiles ; do
-        f=`basename $texmffile`
+        f=$(basename $texmffile)
         cat >> $tmpdir/debian/$packname.links <<EOF
 /usr/share/fonts/type1/$packname/$f  /usr/share/texmf/$texmffile
 /usr/share/fonts/type1/$packname/$f /usr/X11R6/lib/X11/fonts/Type1/$f
@@ -179,7 +179,7 @@
 
 cat > $tmpdir/debian/copyright <<EOF
 This package was debianized by $name <$email> 
-on `date -R` with the help of `basename $0`.
+on $(date -R) with the help of $(basename $0).
 
 Most likely it contains commercial fonts which one is not allowed to 
 distribute.
@@ -188,9 +188,9 @@
 cat > $tmpdir/debian/changelog <<EOF 
 $packname ($revision) unstable; urgency=low
 
-  * packed by `basename $0`
+  * packed by $(basename $0)
 
- -- $name <$email>  `date -R`
+ -- $name <$email>  $(date -R)
 EOF
 
 echo "4" > $tmpdir/debian/compat 
@@ -215,7 +215,7 @@
 fakeroot dh_testdir
 fakeroot dh_testroot
 fakeroot dh_link
-fakeroot dh_installtexfonts
+fakeroot dh_installtex
 fakeroot dh_installxfonts
 fakeroot dh_installdefoma
 fakeroot dh_installdocs