From f898d8962948b40873087846c01f5bb50ffe76f7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 10 Jun 2015 21:39:27 +0200
Subject: perl_checker cleanups

---
 config/live.cfg | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'config/live.cfg')

diff --git a/config/live.cfg b/config/live.cfg
index c434c8d..182685a 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -cw
 
+use MDK::Common;
+
 my $ooo_version = '3.0';
 my $use_modules = to_bool($live->{settings}{pack});
 my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home/' . $live->{settings}{default_user}));
@@ -8,8 +10,8 @@ sub build_one_label {
 	my ($live) = @_;
 
         my ($version, $extra) =  split(/-/, $live->{settings}{version});
-	$version .= "S" if ($extra eq 'spring');
-	"LABEL=" . join ("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product});
+	$version .= "S" if $extra eq 'spring';
+	"LABEL=" . join("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product});
 }
 
 my $_l = {
@@ -183,7 +185,7 @@ my $_l = {
                        "mount -t tmpfs none $tmp",
                        "mkdir $tmp/var",
                        (map {
-                           ("mkdir $tmp$_", "mount -o dirs=$tmp$_=rw:/live/distrib$_=ro -t unionfs unionfs $_")
+                           ("mkdir $tmp$_", "mount -o dirs=$tmp$_=rw:/live/distrib$_=ro -t unionfs unionfs $_");
                        } (qw(/var/log), @sticky)),
                        "chmod 1777 @sticky",
                    );
@@ -230,7 +232,7 @@ my $_l = {
 			    #	"for file in '/etc/xdg/autostart/tracker*.desktop'; do sed s/X-GNOME-Autostart-enabled=true/X-GNOME-Autostart-enabled=false/g $file > '/home/$live->{settings}{default_user}/.config/autostart/$(basename $file)'; done",
 			    #),
 
-                            "d=/var/lib/flash-player-plugin/; [ -d \$d ] && rm -f \$d/*.rpm",
+                            'd=/var/lib/flash-player-plugin/; [ -d $d ] && rm -f $d/*.rpm',
                             
                             # remove some firmwares not needed on liveCD to free up space
                             if_($live->{settings}{media} eq 'CD',
@@ -291,7 +293,7 @@ my $_l = {
             boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ],
             if_($live->{settings}{product} =~ /LiveCD/i,
                 source => build_one_label($live),
-                pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
+                pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
                 extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
                 files => [
             		 if_($live->{settings}{arch} eq 'x86_64',
@@ -309,7 +311,7 @@ my $_l = {
             ),
             if_($live->{settings}{product} =~ /LiveDVD/i,
                 source => build_one_label($live),
-                pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
+                pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
                 extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
                 files => [
             		 if_($live->{settings}{arch} eq 'x86_64',
-- 
cgit v1.2.1