summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-05 21:31:06 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-05 21:31:06 +0200
commit1480c49a86aebc4b7e2b339ec229ddb6477571c8 (patch)
tree8ad25856e6e22033dad8db4d8c30667a628d0646
parent0ac3849a0541bd76342a82962c35441a79a50f1e (diff)
downloaddrakx-1480c49a86aebc4b7e2b339ec229ddb6477571c8.tar
drakx-1480c49a86aebc4b7e2b339ec229ddb6477571c8.tar.gz
drakx-1480c49a86aebc4b7e2b339ec229ddb6477571c8.tar.bz2
drakx-1480c49a86aebc4b7e2b339ec229ddb6477571c8.tar.xz
drakx-1480c49a86aebc4b7e2b339ec229ddb6477571c8.zip
perl_checker cleanups
-rwxr-xr-xperl-install/standalone/finish-install6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index e9edb2e02..7e05fc417 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -257,11 +257,11 @@ sub encrypt_home {
sub ask_gnome_reboot() {
my $lock_file = '/etc/draklive-install.d/gnome-reboot';
- if ( ! is_mgalive() ) {
- if ( -f $lock_file ) {
+ if (!is_mgalive()) {
+ if (-f $lock_file) {
run_program::run('/usr/bin/rm', '-f', $lock_file);
# FIXME: convert to perl/gtk* window popup for translation support
- system("/usr/bin/zenity --timeout=20 --title 'Finishing install' --no-wrap --info --text 'This system will be rebooted\nfor the changes to take effect!'");
+ system('/usr/bin/zenity', '--timeout=20', '--title', 'Finishing install', '--no-wrap', '--info', '--text', 'This system will be rebooted\nfor the changes to take effect!');
run_program::run('/usr/bin/chown', '-R', 'gdm:gdm', '/var/lib/gdm');
run_program::run('/usr/sbin/ldconfig', '-X');
run_program::run('/usr/bin/systemctl', 'reboot');