summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-08-29 19:10:49 +0000
committerJeremy Katz <katzj@redhat.com>2002-08-29 19:10:49 +0000
commitc9b63b2e338798a52b47469b2469cb396556121a (patch)
tree708eb198d973066a1d4b87979915709970d91d35
parentbe7749c1f024e196a2007b6a2e994f80673f43dd (diff)
downloadanaconda-c9b63b2e338798a52b47469b2469cb396556121a.tar.gz
anaconda-c9b63b2e338798a52b47469b2469cb396556121a.tar.xz
anaconda-c9b63b2e338798a52b47469b2469cb396556121a.zip
pull comps images from comps-extras
-rwxr-xr-xscripts/upd-instroot11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 9fa596bec..bd21502bc 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -133,7 +133,8 @@ PACKAGESGR="anaconda XFree86-libs imlib libpng libtiff libjpeg
anaconda-images anaconda-help hdparm XFree86-base-fonts
ttfonts-ko taipeifonts XFree86-ISO8859-15-75dpi-fonts rhpl
redhat-config-keyboard Xft fontconfig expat redhat-artwork
- ttfonts-ja ttfonts-zh_TW bitmap-fonts-cjk urw-fonts rdate"
+ ttfonts-ja ttfonts-zh_TW bitmap-fonts-cjk urw-fonts rdate
+ comps-extras"
if [ -z "$NEEDGR" ]; then
PACKAGESGR="bash"
@@ -604,6 +605,7 @@ usr/share/fonts/ko/TrueType/dotum.ttf
usr/share/fonts/ja/TrueType/kochi-gothic.ttf
usr/share/fonts/zh_TW/TrueType/bsmi00lp.ttf
usr/share/locale/*
+usr/share/pixmaps/comps/*.png
usr/share/pixmaps/gnome-default-dlg.png
usr/share/pixmaps/gnome-error.png
usr/share/pixmaps/gnome-info.png
@@ -716,6 +718,13 @@ rm -f $DESTGR/locales $DESTGR/locales.list
rm -rf $DESTGR/usr/X11R6/lib/modules/dri
rm -f $DESTGR/usr/X11R6/lib/modules/extensions/lib{GLcore,glx,pex5}*
+# moving comps-extras images in to where anaconda expects them
+echo "Moving comps-extras pixmaps to where anaconda expects them"
+if [ -n "$NEEDGR" ]; then
+ mkdir -p $DESTGR/usr/share/pixmaps/comps
+ mv $DESTGR/usr/share/pixmaps/comps/* $DESTGR/usr/share/anaconda/pixmaps/comps/
+fi
+
echo "Running mkfontdir..."
if [ -n "$NEEDGR" ]; then
/usr/X11R6/bin/mkfontdir -p /usr/X11R6/lib/X11/fonts/encodings/ -e $DESTGR/usr/X11R6/lib/X11/fonts/encodings $DESTGR/usr/X11R6/lib/X11/fonts/* $DESTGR/usr/share/fonts/ISO8859-2/* $DESTGR/usr/share/fonts/ISO8859-9/*