summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xperl-install/standalone/draksplash13
1 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 6670a205f..ce89f3d9b 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -28,6 +28,8 @@ 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 $cfg_path = "/cfg/";
+
my $img_file;
my $prev_window;
@@ -157,7 +159,7 @@ $first{widgets}{combo}{res}->entry->signal_connect(changed => sub {
$boot_conf_frame{frame} = Gtk2::Frame->new(N("Configure bootsplash picture"));
&make_boot_frame;
$first_vbox->add($boot_conf_frame{frame});
- member($theme{name}, giv_exist_thm()) and thm_in_this_res() and get_this_thm_res_conf() || $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res}));
+ member($theme{name}, giv_exist_thm()) && thm_in_this_res() && get_this_thm_res_conf() || $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res}));
});
#- go to bootsplash configuration step 2
#$first{widgets}{button}{boot_conf}->signal_connect(clicked => sub{show_act(\%boot_conf_frame) } );
@@ -210,12 +212,11 @@ sub write_boot_thm {
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/bootsplash-'.$theme{res}{res}.'.cfg';
+ my $cfg_file = $thm_conf_path . $theme{name} . "$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg';
#- verify all dir exists or create them
-d $thm_conf_path.$theme{name}
or mkdir($thm_conf_path.$theme{name});
- -d $thm_conf_path.$theme{name}.'/cfg'
- or mkdir($thm_conf_path.$theme{name}.'/cfg');
+ mkdir($thm_conf_path.$theme{name} . $cfg_path) if !-d $thm_conf_path.$theme{name} . "/$cfg_path";
-d $thm_path.$theme{name}
or mkdir($thm_path.$theme{name});
-d $thm_path.$theme{name}.'/images/'
@@ -281,9 +282,9 @@ sub get_this_thm_res_conf() {
sub read_boot_conf {
chdir($thm_conf_path);
my $line;
- if (-f $theme{name}.'/cfg/bootsplash-'.$theme{res}{res}.'.cfg') {
+ if (-f $theme{name} . "/$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg') {
local *CFG;
- open CFG, $theme{name}.'/cfg/bootsplash-'.$theme{res}{res}.'.cfg';
+ open CFG, $theme{name} . "/$cfg_path/bootsplash-" . $theme{res}{res} . '.cfg';
while ($line = <CFG>) {
$line =~ m/^([a-z][a-z])=([^\n]+)/
and $theme{boot_conf}{$1} = $2;