From b7d0dcc8951c5dbb26ddd222da7a4096c8329899 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 9 Mar 2004 10:00:46 +0000 Subject: rename thm_conf_path as boot_conf_path to prevent confusion with thm_path --- perl-install/standalone/draksplash | 11 +++++------ 1 file 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; -- cgit v1.2.1