Move emerald scripts to tools dir.

diff --git a/README.md b/README.md
index 6a89c81508709e6bfcf3923c675e903c4b0893d6..e90ea9345bedf700d090ac1767bc232fa7507c1c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -36,12 +36,13 @@ guide from a command prompt, like this:
 
        make html
 
-For building the PDF version, you need a reasonably recent installation 
-of TeX Live.  Release 2014 will do.  You will also need the Emerald 
-package from https://www.ctan.org/tex-archive/fonts/emerald/.  This 
-cannot be installed with tlmgr, nor does it seem to be packaged by the 
-usual Linux or BSD distributions.  Scripts for installing and 
-uninstalling Emerald are provided here.  When you're ready, type this:
+For building the PDF version, you need a reasonably recent installation of
+TeX Live.  Release 2014 will do.  You will also need the Emerald font
+package from https://www.ctan.org/tex-archive/fonts/emerald/.  This cannot
+be installed with `tlmgr`, nor does it seem to be packaged by the usual
+Linux or BSD distributions.  Scripts for installing and uninstalling
+Emerald are provided in the `tools` directory.  When you're ready, type
+this:
 
        make latexpdf
 

diff --git a/install-emerald.sh b/install-emerald.sh
deleted file mode 100755 (executable)
index 79d0967..0000000
--- a/install-emerald.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# This script installs the Emerald CTAN package from
-# https://www.ctan.org/tex-archive/fonts/emerald/
-# into $TEXMFLOCAL, which is usually /usr/local/share/texmf
-#
-# To use, put emerald.zip in the same directory as this script, unzip
-# emerald.zip, and execute this script.
-#
-# Created by David Griffith <dave@661.org>
-# Released into the public domain 2016
-
-
-
-if [ `ps -o uid= $$` -ne 0 ] ; then
-       echo "This script must be run as root"
-       exit 1
-fi
-
-PERM=644
-DPERM=755
-PKGDIR="emerald"
-TEXMFLOCAL=`kpsewhich -var TEXMFLOCAL`
-
-echo "Installing to $TEXMFLOCAL..."
-echo "Making directories..."
-install -m $DPERM -d   $TEXMFLOCAL/fonts/afm/emerald \
-                       $TEXMFLOCAL/fonts/map/dvips \
-                       $TEXMFLOCAL/fonts/tfm/emerald \
-                       $TEXMFLOCAL/fonts/type1/emerald \
-                       $TEXMFLOCAL/fonts/vf/emerald
-
-install -m $DPERM -d   $TEXMFLOCAL/other $TEXMFLOCAL/tex/latex/emerald
-install -m $DPERM -d   $TEXMFLOCAL $TEXMFLOCAL/web2c
-
-echo "Installing stuff..."
-install -m $PERM -D $PKGDIR/fonts/afm/emerald/* $TEXMFLOCAL/fonts/afm/emerald
-install -m $PERM -D $PKGDIR/fonts/map/dvips/emerald.map $TEXMFLOCAL/fonts/map/dvips
-install -m $PERM -D $PKGDIR/fonts/tfm/emerald/* $TEXMFLOCAL/fonts/tfm/emerald
-install -m $PERM -D $PKGDIR/fonts/type1/emerald/* $TEXMFLOCAL/fonts/type1/emerald
-install -m $PERM -D $PKGDIR/fonts/vf/emerald/* $TEXMFLOCAL/fonts/vf/emerald
-install -m $PERM -D $PKGDIR/other/* $TEXMFLOCAL/other
-install -m $PERM -D $PKGDIR/tex/latex/emerald/* $TEXMFLOCAL/tex/latex/emerald
-
-echo "Map emerald.map" >> $TEXMFLOCAL/web2c/updmap.cfg
-mktexlsr $TEXMFLOCAL
-updmap-sys

diff --git a/tools/install-emerald.sh b/tools/install-emerald.sh
new file mode 100755 (executable)
index 0000000..79d0967
--- /dev/null
+++ b/tools/install-emerald.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# This script installs the Emerald CTAN package from
+# https://www.ctan.org/tex-archive/fonts/emerald/
+# into $TEXMFLOCAL, which is usually /usr/local/share/texmf
+#
+# To use, put emerald.zip in the same directory as this script, unzip
+# emerald.zip, and execute this script.
+#
+# Created by David Griffith <dave@661.org>
+# Released into the public domain 2016
+
+
+
+if [ `ps -o uid= $$` -ne 0 ] ; then
+       echo "This script must be run as root"
+       exit 1
+fi
+
+PERM=644
+DPERM=755
+PKGDIR="emerald"
+TEXMFLOCAL=`kpsewhich -var TEXMFLOCAL`
+
+echo "Installing to $TEXMFLOCAL..."
+echo "Making directories..."
+install -m $DPERM -d   $TEXMFLOCAL/fonts/afm/emerald \
+                       $TEXMFLOCAL/fonts/map/dvips \
+                       $TEXMFLOCAL/fonts/tfm/emerald \
+                       $TEXMFLOCAL/fonts/type1/emerald \
+                       $TEXMFLOCAL/fonts/vf/emerald
+
+install -m $DPERM -d   $TEXMFLOCAL/other $TEXMFLOCAL/tex/latex/emerald
+install -m $DPERM -d   $TEXMFLOCAL $TEXMFLOCAL/web2c
+
+echo "Installing stuff..."
+install -m $PERM -D $PKGDIR/fonts/afm/emerald/* $TEXMFLOCAL/fonts/afm/emerald
+install -m $PERM -D $PKGDIR/fonts/map/dvips/emerald.map $TEXMFLOCAL/fonts/map/dvips
+install -m $PERM -D $PKGDIR/fonts/tfm/emerald/* $TEXMFLOCAL/fonts/tfm/emerald
+install -m $PERM -D $PKGDIR/fonts/type1/emerald/* $TEXMFLOCAL/fonts/type1/emerald
+install -m $PERM -D $PKGDIR/fonts/vf/emerald/* $TEXMFLOCAL/fonts/vf/emerald
+install -m $PERM -D $PKGDIR/other/* $TEXMFLOCAL/other
+install -m $PERM -D $PKGDIR/tex/latex/emerald/* $TEXMFLOCAL/tex/latex/emerald
+
+echo "Map emerald.map" >> $TEXMFLOCAL/web2c/updmap.cfg
+mktexlsr $TEXMFLOCAL
+updmap-sys

diff --git a/tools/uninstall-emerald.sh b/tools/uninstall-emerald.sh
new file mode 100755 (executable)
index 0000000..c2a4640
--- /dev/null
+++ b/tools/uninstall-emerald.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# This script uninstalls the Emerald CTAN package from $TEXMFLOCAL.
+# It may be executed anywhere.
+
+# Created by David Griffith <dave@661.org>
+# Released into the public domain 2016
+
+if [ `ps -o uid= $$` -ne 0 ] ; then
+       echo "This script must be run as root"
+       exit 1
+fi
+
+TEXMFLOCAL=`kpsewhich -var TEXMFLOCAL`
+
+echo "Deleting emerald from $TEXMFLOCAL..."
+
+rm -f $TEXMFLOCAL/fonts/map/dvips/emerald.map
+rm -rf $TEXMFLOCAL/fonts/afm/emerald
+rm -rf $TEXMFLOCAL/fonts/tfm/emerald
+rm -rf $TEXMFLOCAL/fonts/type1/emerald
+rm -rf $TEXMFLOCAL/fonts/vf/emerald
+rm -rf $TEXMFLOCAL/tex/latex/emerald
+
+rm -f $TEXMFLOCAL/other/apicture.ttf \
+       $TEXMFLOCAL/other/AUGIE___.INF \
+       $TEXMFLOCAL/other/DECAC___.INF \
+       $TEXMFLOCAL/other/DECADENC.INF \
+       $TEXMFLOCAL/other/DECAIAL_.INF \
+       $TEXMFLOCAL/other/DECAI___.INF \
+       $TEXMFLOCAL/other/DECAIM__.INF \
+       $TEXMFLOCAL/other/DECAITD_.INF \
+       $TEXMFLOCAL/other/DECAWTD_.INF \
+       $TEXMFLOCAL/other/INTID___.INF \
+       $TEXMFLOCAL/other/INTIMACY.INF \
+       $TEXMFLOCAL/other/J.D.____.INF \
+       $TEXMFLOCAL/other/movieola.inf \
+       $TEXMFLOCAL/other/moviettt.inf \
+       $TEXMFLOCAL/other/POOKIE__.INF \
+       $TEXMFLOCAL/other/SKEETCH_.TTF \
+       $TEXMFLOCAL/other/SPANBBI_.INF \
+       $TEXMFLOCAL/other/SPANBB__.INF \
+       $TEXMFLOCAL/other/SPANBI__.INF \
+       $TEXMFLOCAL/other/SPANB___.INF \
+       $TEXMFLOCAL/other/Syriac__.inf \
+       $TEXMFLOCAL/other/Tallpaul.inf \
+       $TEXMFLOCAL/other/TEENSPIR.TTF \
+       $TEXMFLOCAL/other/WEBSTER_.INF
+
+sed -i s/Map\ emerald.map//g $TEXMFLOCAL/web2c/updmap.cfg
+sed -i '/^$/d' $TEXMFLOCAL/web2c/updmap.cfg
+if [ ! -s $TEXMFLOCAL/web2c/updmap.cfg ] ; then
+       rm $TEXMFLOCAL/web2c/updmap.cfg
+fi
+
+rmdir --ignore-fail-on-non-empty $TEXMFLOCAL/fonts/map/dvips \
+                               $TEXMFLOCAL/fonts/afm \
+                               $TEXMFLOCAL/fonts/map \
+                               $TEXMFLOCAL/fonts/tfm \
+                               $TEXMFLOCAL/fonts/type1 \
+                               $TEXMFLOCAL/fonts/vf \
+                               $TEXMFLOCAL/tex/latex \
+                               $TEXMFLOCAL/fonts \
+                               $TEXMFLOCAL/tex \
+                               $TEXMFLOCAL/other \
+                               $TEXMFLOCAL/web2c/
+
+
+mktexlsr $TEXMFLOCAL
+updmap-sys

diff --git a/uninstall-emerald.sh b/uninstall-emerald.sh
deleted file mode 100755 (executable)
index c2a4640..0000000
--- a/uninstall-emerald.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# This script uninstalls the Emerald CTAN package from $TEXMFLOCAL.
-# It may be executed anywhere.
-
-# Created by David Griffith <dave@661.org>
-# Released into the public domain 2016
-
-if [ `ps -o uid= $$` -ne 0 ] ; then
-       echo "This script must be run as root"
-       exit 1
-fi
-
-TEXMFLOCAL=`kpsewhich -var TEXMFLOCAL`
-
-echo "Deleting emerald from $TEXMFLOCAL..."
-
-rm -f $TEXMFLOCAL/fonts/map/dvips/emerald.map
-rm -rf $TEXMFLOCAL/fonts/afm/emerald
-rm -rf $TEXMFLOCAL/fonts/tfm/emerald
-rm -rf $TEXMFLOCAL/fonts/type1/emerald
-rm -rf $TEXMFLOCAL/fonts/vf/emerald
-rm -rf $TEXMFLOCAL/tex/latex/emerald
-
-rm -f $TEXMFLOCAL/other/apicture.ttf \
-       $TEXMFLOCAL/other/AUGIE___.INF \
-       $TEXMFLOCAL/other/DECAC___.INF \
-       $TEXMFLOCAL/other/DECADENC.INF \
-       $TEXMFLOCAL/other/DECAIAL_.INF \
-       $TEXMFLOCAL/other/DECAI___.INF \
-       $TEXMFLOCAL/other/DECAIM__.INF \
-       $TEXMFLOCAL/other/DECAITD_.INF \
-       $TEXMFLOCAL/other/DECAWTD_.INF \
-       $TEXMFLOCAL/other/INTID___.INF \
-       $TEXMFLOCAL/other/INTIMACY.INF \
-       $TEXMFLOCAL/other/J.D.____.INF \
-       $TEXMFLOCAL/other/movieola.inf \
-       $TEXMFLOCAL/other/moviettt.inf \
-       $TEXMFLOCAL/other/POOKIE__.INF \
-       $TEXMFLOCAL/other/SKEETCH_.TTF \
-       $TEXMFLOCAL/other/SPANBBI_.INF \
-       $TEXMFLOCAL/other/SPANBB__.INF \
-       $TEXMFLOCAL/other/SPANBI__.INF \
-       $TEXMFLOCAL/other/SPANB___.INF \
-       $TEXMFLOCAL/other/Syriac__.inf \
-       $TEXMFLOCAL/other/Tallpaul.inf \
-       $TEXMFLOCAL/other/TEENSPIR.TTF \
-       $TEXMFLOCAL/other/WEBSTER_.INF
-
-sed -i s/Map\ emerald.map//g $TEXMFLOCAL/web2c/updmap.cfg
-sed -i '/^$/d' $TEXMFLOCAL/web2c/updmap.cfg
-if [ ! -s $TEXMFLOCAL/web2c/updmap.cfg ] ; then
-       rm $TEXMFLOCAL/web2c/updmap.cfg
-fi
-
-rmdir --ignore-fail-on-non-empty $TEXMFLOCAL/fonts/map/dvips \
-                               $TEXMFLOCAL/fonts/afm \
-                               $TEXMFLOCAL/fonts/map \
-                               $TEXMFLOCAL/fonts/tfm \
-                               $TEXMFLOCAL/fonts/type1 \
-                               $TEXMFLOCAL/fonts/vf \
-                               $TEXMFLOCAL/tex/latex \
-                               $TEXMFLOCAL/fonts \
-                               $TEXMFLOCAL/tex \
-                               $TEXMFLOCAL/other \
-                               $TEXMFLOCAL/web2c/
-
-
-mktexlsr $TEXMFLOCAL
-updmap-sys