summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-09 10:00:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-09 10:00:46 +0000
commitb7d0dcc8951c5dbb26ddd222da7a4096c8329899 (patch)
treef612732df3a2b5aae78f5d0ea571e424a9ac4c47 /perl-install/standalone
parent1de606e4c3eaafd1b1dfe2b2b1aa83153abf0cbc (diff)
downloaddrakx-b7d0dcc8951c5dbb26ddd222da7a4096c8329899.tar
drakx-b7d0dcc8951c5dbb26ddd222da7a4096c8329899.tar.gz
drakx-b7d0dcc8951c5dbb26ddd222da7a4096c8329899.tar.bz2
drakx-b7d0dcc8951c5dbb26ddd222da7a4096c8329899.tar.xz
drakx-b7d0dcc8951c5dbb26ddd222da7a4096c8329899.zip
rename thm_conf_path as boot_conf_path to prevent confusion with thm_path
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/draksplash11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index c8305f043..e4710330a 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -27,14 +27,13 @@ unless ($in->do_pkgs->is_installed('ImageMagick')) {
my $tmp_path = '/tmp/draksplash/';
! -d $tmp_path and mkdir($tmp_path);
my $thm_path = '/usr/share/bootsplash/themes/';
-my $thm_conf_path = '/etc/bootsplash/themes/';
+my $boot_conf_path = '/etc/bootsplash/themes/';
my $cfg_path = "/cfg/";
my $img_file;
my $prev_window;
-my $boot_conf_path = '/etc/bootsplash/themes/';
my %font_size = ('h' =>16, 'w' =>8);
my %theme = ('name' => 'new_theme',
'res' => {
@@ -211,10 +210,10 @@ sub write_boot_thm {
&set_thm_values;
my $logo = $boot_conf_frame{widgets}{check}{logo}->get_active ? 'yes' : 'no';
my $quiet = $boot_conf_frame{widgets}{check}{quiet}->get_active ? 'yes' : 'no';
- my $globalconf_file = $thm_conf_path.$theme{name}.'/global.config';
- my $cfg_file = $thm_conf_path . $theme{name} . "$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg';
+ my $globalconf_file = boot_conf_path.$theme{name}.'/global.config';
+ my $cfg_file = boot_conf_path . $theme{name} . "$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg';
#- verify all dir exists or create them
- foreach my $dir ($thm_conf_path . $theme{name} . $cfg_path, $thm_path.$theme{name} . '/images/') {
+ foreach my $dir (boot_conf_path . $theme{name} . $cfg_path, $thm_path.$theme{name} . '/images/') {
mkdir_p($dir) if !-d $dir;
}
#- copy image to dest by convert
@@ -276,7 +275,7 @@ sub get_this_thm_res_conf() {
}
sub read_boot_conf {
- chdir($thm_conf_path);
+ chdir(boot_conf_path);
my $line;
if (-f $theme{name} . "/$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg') {
local *CFG;