artwiz-fonts: added config option to install unicode versions of the fonts (adds cyrillic symbols also, 7 fonts);

we don't use tabs anywhere but in HISTORY -- fixed this
quoting paths, so a user can put the spaces in theirs names

5 files changed, 36 insertions, 20 deletions

diff --git a/fonts/artwiz-fonts/CONFIGURE b/fonts/artwiz-fonts/CONFIGURE
index 58dcb4c9da..e8442f438a 100755
--- a/fonts/artwiz-fonts/CONFIGURE
+++ b/fonts/artwiz-fonts/CONFIGURE
@@ -1,3 +1,6 @@
-. ${GRIMOIRE}/config_query_multi.function                                 &&
+. ${GRIMOIRE}/config_query_multi.function &&
+
+config_query ART_UNICODE "Replace some of the fonts with unicode equivalents?" n &&
+
 config_query_multi ART_ENC "Which additional encodings would you like to install?" \
-	none de se
+                   none de se
diff --git a/fonts/artwiz-fonts/HISTORY b/fonts/artwiz-fonts/HISTORY
index 9cd6be1164..9f77ccdfe8 100644
--- a/fonts/artwiz-fonts/HISTORY
+++ b/fonts/artwiz-fonts/HISTORY
@@ -1,3 +1,11 @@
+2008-11-02 Vlad Glagolev <stealth@sourcemage.org>
+	* CONFIGURE: added unicode version selection for some fonts
+	* PRE_BUILD: replace some fonts with unicode equivalents if the option
+	  is selected; quoting paths; don't use the tabs
+	* INSTALL: don't use the tabs; improved readability; use install instead
+	  of mkdir; added missing `&&'
+	* artwiz-ru.tgz: added
+
 2006-07-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS, FINAL, POST_REMOVE: changed to use section wide files
 
@@ -77,4 +85,3 @@
 	* Added History file and fixed tarball source link as has changed on site.
 	  Homepage url is not available... Fixes bug #62 while section maintainer
 	  is still missing.
-
diff --git a/fonts/artwiz-fonts/INSTALL b/fonts/artwiz-fonts/INSTALL
index a2eb52d985..b27661d7af 100755
--- a/fonts/artwiz-fonts/INSTALL
+++ b/fonts/artwiz-fonts/INSTALL
@@ -1,13 +1,13 @@
-local FONT_DIR="${INSTALL_ROOT}/usr/share/fonts/misc"
-local INSTALL="install -m 644 -o root -g root"
-mkdir  -p  ${FONT_DIR}                                       &&
-$INSTALL ${SOURCE_DIRECTORY}/*.{pcf,alias} \
-	${FONT_DIR}
+local FONT_DIR="${INSTALL_ROOT}/usr/share/fonts/misc" &&
+local INSTALL="install -m 644 -o root -g root" &&
+
+install -vm 755 -d ${FONT_DIR} &&
+$INSTALL ${SOURCE_DIRECTORY}/*.{pcf,alias} ${FONT_DIR} &&
+
 if list_find "$ART_ENC" "de"; then
-	$INSTALL ${SOURCE2_DIRECTORY}/*.{pcf,alias} \
-		${FONT_DIR}
-fi                                                           &&
+  $INSTALL ${SOURCE2_DIRECTORY}/*.{pcf,alias} ${FONT_DIR}
+fi &&
+
 if list_find "$ART_ENC" "se"; then
-	$INSTALL ${SOURCE3_DIRECTORY}/*.{pcf,alias} \
-		${FONT_DIR}
+  $INSTALL ${SOURCE3_DIRECTORY}/*.{pcf,alias} ${FONT_DIR}
 fi
diff --git a/fonts/artwiz-fonts/PRE_BUILD b/fonts/artwiz-fonts/PRE_BUILD
index 7ef1a12ccc..009e5ad81b 100755
--- a/fonts/artwiz-fonts/PRE_BUILD
+++ b/fonts/artwiz-fonts/PRE_BUILD
@@ -1,10 +1,16 @@
-mk_source_dir ${SOURCE_DIRECTORY}          &&
-unpack_file
+mk_source_dir "$SOURCE_DIRECTORY" &&
+unpack_file &&
+
+if [[ $ART_UNICODE == y ]]; then
+  tar -C "$SOURCE_DIRECTORY" -xzf "$SPELL_DIRECTORY/artwiz-ru.tgz"
+fi &&
+
 if list_find "$ART_ENC" "de"; then
-	mk_source_dir ${SOURCE2_DIRECTORY} &&
-	unpack_file 2
-fi                                         &&
+  mk_source_dir "$SOURCE2_DIRECTORY" &&
+  unpack_file 2
+fi &&
+
 if list_find "$ART_ENC" "se"; then
-	mk_source_dir ${SOURCE3_DIRECTORY} &&
-	unpack_file 3
+  mk_source_dir "$SOURCE3_DIRECTORY" &&
+  unpack_file 3
 fi
diff --git a/fonts/artwiz-fonts/artwiz-ru.tgz b/fonts/artwiz-fonts/artwiz-ru.tgz
new file mode 100644
index 0000000000..c1e4245036
--- /dev/null
+++ b/fonts/artwiz-fonts/artwiz-ru.tgz