summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-10-27 12:03:52 +0000
committerFrancois Pons <fpons@mandriva.com>2000-10-27 12:03:52 +0000
commitbe4f26c73d9caab8835f185ae3f7736165b315e3 (patch)
tree396661488fcefac1184a8a232c0168bc7483b8bd
parent1651866ce000f6ff0fc2c8f7529b36497f3be1fc (diff)
downloaddrakx-be4f26c73d9caab8835f185ae3f7736165b315e3.tar
drakx-be4f26c73d9caab8835f185ae3f7736165b315e3.tar.gz
drakx-be4f26c73d9caab8835f185ae3f7736165b315e3.tar.bz2
drakx-be4f26c73d9caab8835f185ae3f7736165b315e3.tar.xz
drakx-be4f26c73d9caab8835f185ae3f7736165b315e3.zip
Make sure to remove font path in /tmp/drakx before exiting.
-rwxr-xr-xperl-install/live_install23
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/live_install2 b/perl-install/live_install2
index e2a07f4c5..6745b12b1 100755
--- a/perl-install/live_install2
+++ b/perl-install/live_install2
@@ -11,13 +11,14 @@ $ENV{SHARE_PATH} = "$dir/usr/share";
system "../../../lib/ld-linux.so.2", "../perl", "./install2", "--live", @ARGV;
+$ENV{DISPLAY} and system "xset", "-fp", "/tmp/drakx/mdkinst/usr/X11R6/lib/X11/fonts/";
foreach (qw(misc PEX Speedo Type1 mdk 75dpi 100dpi cyrillic)) {
-d "/usr/X11R6/lib/X11/fonts/$_" or next;
-e "/usr/X11R6/lib/X11/fonts/$_/fonts.dir" and next;
chdir "/usr/X11R6/lib/X11/fonts/$_";
system "mkfontdir";
- $ENV{DISPLAY} and system "xset", "fp", "rehash";
}
+$ENV{DISPLAY} and system "xset", "fp", "rehash";
system "/bin/rm", "-rf", "/tmp/drakx";
system "/bin/rm", "-rf", "/tmp/rhimage";