summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootlook.pm10
-rw-r--r--perl-install/my_gtk.pm4
-rwxr-xr-xperl-install/standalone/XFdrake8
-rwxr-xr-xperl-install/standalone/drakTermServ4
-rwxr-xr-xperl-install/standalone/drakautoinst6
-rwxr-xr-xperl-install/standalone/drakboot2
-rwxr-xr-xperl-install/standalone/drakconnect4
-rwxr-xr-xperl-install/standalone/drakfloppy8
-rwxr-xr-xperl-install/standalone/drakfont6
-rwxr-xr-xperl-install/standalone/drakgw6
-rwxr-xr-xperl-install/standalone/draksec4
-rwxr-xr-xperl-install/standalone/drakxservices2
-rwxr-xr-xperl-install/standalone/keyboarddrake4
-rwxr-xr-xperl-install/standalone/mousedrake6
-rwxr-xr-xperl-install/standalone/printerdrake4
-rwxr-xr-xperl-install/standalone/scannerdrake2
-rwxr-xr-xperl-install/standalone/tinyfirewall4
17 files changed, 41 insertions, 43 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index 32913859a..39b234d59 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -58,7 +58,7 @@ my $inmain = 0;
my $lilogrub = chomp_(`detectloader -q`);
my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window ("toplevel");
-$window->signal_connect(delete_event => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) });
+$window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) });
$window->set_title(_("Boot Style Configuration"));
$window->border_width(2);
#$window->realize;
@@ -77,7 +77,7 @@ my $pixmap = new Gtk::Pixmap($h_pixmap, $h_mask);
# the menus are not shown
# but they provides shiny shortcut like C-q
my @menu_items = ( { path => _("/_File"), type => '<Branch>' },
- { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) } },
+ { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } },
);
my $menubar = get_main_menu($window);
######### menus end
@@ -324,8 +324,8 @@ Click on Configure to launch the setup wizard.", $lilogrub),
)
),
gtkadd (gtkset_layout(new Gtk::HButtonBox,-end),
- gtksignal_connect(new Gtk::Button(_("OK")), clicked => sub{ updateInit(); updateAutologin(); updateAurora(); $::isEmbedded ? kill(USR1,$::CCPID) : Gtk->exit(0) }),
- gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) })
+ gtksignal_connect(new Gtk::Button(_("OK")), clicked => sub{ updateInit(); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk->exit(0) }),
+ gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) })
)
)
);
@@ -345,7 +345,7 @@ if ($a_mode) {
$window->show_all();
$no_bootsplash and $thm_frame->hide();
Gtk->main_iteration while Gtk->events_pending;
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
$inmain=1;
Gtk->main;
Gtk->exit(0);
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index a672c2421..f5064c898 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -98,7 +98,7 @@ sub new {
flush();
$::Plug->add($o->{window});
}
- $::CCPID and kill "USR2", $::CCPID;
+ $::CCPID and kill 'USR2', $::CCPID;
$o;
}
sub main {
@@ -137,7 +137,7 @@ sub flush { gtkflush() }
sub exit {
gtkset_mousecursor_normal(); #- for restoring a normal in any case
flush();
- $::isEmbedded and kill USR1, $::CCPID;
+ $::isEmbedded and kill 'USR1', $::CCPID;
c::_exit($_[1]) #- workaround
}
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 08414be56..fdc0250e5 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -35,7 +35,7 @@ my ($configure_this) = grep { !/^-/ } @ARGV;
$configure_this ||= 'everything';
/-h/ || $configure_this !~ /^(resolution|monitor|everything|auto_install)/ and die <<'EOF';
-usage: XFdrake [--expert] [--noauto] [--skiptest] [--auto] [everything]
+usage: XFdrake [--expert] [--noauto] [--auto] [everything]
XFdrake [--noauto] monitor
XFdrake resolution
EOF
@@ -47,11 +47,9 @@ $::testing = /-testing/;
begin:
{
- $X->{skiptest} = /-skiptest/;
-
my $in = 'interactive'->vnew('su', 'X');
- $::isEmbedded and kill USR2, $::CCPID;
+ $::isEmbedded and kill 'USR2', $::CCPID;
my $rc = do {
if ($configure_this eq 'everything') {
@@ -79,7 +77,7 @@ begin:
$in->exit(0) if !$::isEmbedded;
- kill USR1, $::CCPID;
+ kill 'USR1', $::CCPID;
goto begin;
}
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 373c57994..30981aa6a 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -246,7 +246,7 @@ sub interactive_mode {
gtksignal_connect(new Gtk::Button(_("Help")),clicked =>
sub { ${$central_widget}->destroy(); help() }),
gtksignal_connect(new Gtk::Button(_("Close")), clicked => sub {
- $::isEmbedded and kill "USR1", $::CCPID;
+ $::isEmbedded and kill 'USR1', $::CCPID;
Gtk->main_quit() }),
),
),
@@ -260,7 +260,7 @@ sub interactive_mode {
$window1->show_all();
Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill "USR2", $::CCPID;
+ $::isEmbedded and kill 'USR2', $::CCPID;
Gtk->main;
Gtk->exit(0);
}
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index dc18dfca8..9eedb1494 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -37,7 +37,7 @@ $::direct = 1; #DEBUG
my $in = 'interactive'->vnew('su', 'default');
begin:
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
my $imagefile = "/root/drakx/replay_install.img";
-f $imagefile or $in->ask_okcancel(_("Error!"),
@@ -213,7 +213,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) {
# );
# $notebook->set_tab_pos('left');
# $::isEmbedded and Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill (12, $::CCPID);
+ $::isEmbedded and kill ('USR2', $::CCPID);
$W->main;
# $W->destroy();
}
@@ -244,7 +244,7 @@ quit_global($in, 0);
sub quit_global {
my ($in, $exitcode) = @_;
- $::isEmbedded ? kill USR1, $::CCPID : $in->exit($exitcode);
+ $::isEmbedded ? kill 'USR1', $::CCPID : $in->exit($exitcode);
goto begin;
}
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 320c1fe79..9c3449d1d 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -31,7 +31,7 @@ if ($in->isa('interactive::gtk')) {
}
!$::isEmbedded and $in->exit(0);
-kill(USR1, $::CCPID);
+kill('USR1', $::CCPID);
goto ask;
sub lilo_choice
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 21fa2b9e9..903d9d0b3 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -322,7 +322,7 @@ $combo1->entry->signal_connect('changed', sub {
$window1->show_all();
$_->hide foreach ($button1, $button3);
Gtk->main_iteration while Gtk->events_pending;
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
my $tag = Gtk->timeout_add(4000, \&update2);
Gtk->main;
Gtk->exit(0);
@@ -413,7 +413,7 @@ sub update2 {
}
sub quit_global {
- $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0);
+ $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0);
}
sub configure_lan {
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 2cc0a3604..471beb475 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -69,7 +69,7 @@ my @titles = ( _("Module name"), _("Size") );
my $list = new_with_titles Gtk::CList( @titles );
my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
-$window->signal_connect( 'delete_event', sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) });
+$window->signal_connect( 'delete_event', sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) });
$window->set_title( _("drakfloppy") );
$window->set_policy(1, 1, 1);
$window->border_width (5);
@@ -79,7 +79,7 @@ $window->border_width (5);
# but they provides shiny shortcut like C-q
my @menu_items = (
{ path => _("/_File"), type => '<Branch>' },
- { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) } },
+ { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } },
);
my $menubar = get_main_menu( $window );
@@ -233,7 +233,7 @@ $global_vbox->pack_start ($output_frame, 0, 0, 0);
my $build_button = new Gtk::Button( _("Build the disk") );
my $cancel_button = new Gtk::Button( _("Cancel") );
my $fin_hbox = new Gtk::HBox( 0, 0 );
-$cancel_button->signal_connect( clicked=> sub {$::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0)});
+$cancel_button->signal_connect( clicked=> sub {$::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0)});
$build_button->signal_connect('clicked', \&build_it);
$fin_hbox->pack_end($cancel_button, 0, 0, 0);
$fin_hbox->pack_end($build_button, 0, 0, 10);
@@ -248,7 +248,7 @@ $expert_mod_frame->hide();
$expert_button_frame->hide();
Gtk->main_iteration while Gtk->events_pending;
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
Gtk->main;
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d0f92deb3..986f8df7d 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -704,7 +704,7 @@ sub interactive_mode {
gtksignal_connect(
new Gtk::Button( _("Close") ),
clicked => sub {
- $::isEmbedded and kill USR1, $::CCPID;
+ $::isEmbedded and kill 'USR1', $::CCPID;
Gtk->main_quit();
}
),
@@ -722,7 +722,7 @@ sub interactive_mode {
# gtksignal_connect(new Gtk::Button(_(" Help ")), clicked => sub {
# ${$central_widget}->destroy(); help() }),
# gtksignal_connect(new Gtk::Button(_("Close")), clicked => sub {
- # $::isEmbedded and kill USR1, $::CCPID;
+ # $::isEmbedded and kill 'USR1', $::CCPID;
# Gtk->main_quit() }),
# ),
# )
@@ -740,7 +740,7 @@ sub interactive_mode {
# $window1->show_all();
Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill USR2, $::CCPID;
+ $::isEmbedded and kill 'USR2', $::CCPID;
Gtk->main;
Gtk->exit(0);
}
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index ace20447d..b31721dae 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -592,17 +592,17 @@ Click on Configure to launch the setup wizard.", $setup_state));
my $button_conf = new Gtk::Button _("Configure");
$button_conf->signal_connect(clicked => sub {
system("/usr/sbin/drakgw --wizard");
- kill(USR1, $::CCPID);
+ kill('USR1', $::CCPID);
});
$bbox1->add($button_conf);
my $button_cancel = new Gtk::Button _("Cancel");
$button_cancel->signal_connect(clicked => sub {
- kill(USR1, $::CCPID);
+ kill('USR1', $::CCPID);
});
$bbox1->add($button_cancel);
$window1->show_all();
Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill USR2, $::CCPID;
+ $::isEmbedded and kill 'USR2', $::CCPID;
Gtk->main;
Gtk->exit(0);
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 9f4002e96..a14049097 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -18,9 +18,9 @@ $::expert = /-expert/ || cat_("/etc/sysconfig/system") =~ /^CLASS="?expert/m; #"
my $in = 'interactive'->vnew('su', 'security');
begin:
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
security::main::main($prefix, $in);
-!$::isEmbedded ? $in->exit(0) : kill(USR1, $::CCPID);
+!$::isEmbedded ? $in->exit(0) : kill('USR1', $::CCPID);
goto begin;
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 5c19e2a2a..a57b430bb 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -19,5 +19,5 @@ begin:
my $l = services::ask($in);
services::doit($in, $l) if $l;
!$::isEmbedded and $in->exit(0);
-kill USR1, $::CCPID;
+kill 'USR1', $::CCPID;
goto begin;
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index e5137530c..7940726fa 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -26,7 +26,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
$in = 'interactive'->vnew('su', 'keyboard');
begin:
- $::isEmbedded and kill USR2, $::CCPID;
+ $::isEmbedded and kill 'USR2', $::CCPID;
choose:
$keyboard->{KEYBOARD} = $in->ask_from_listf(_("Keyboard"),
_("Please, choose your keyboard layout."),
@@ -59,7 +59,7 @@ keyboard::write($keyboard);
end:
if ($::isEmbedded) {
- kill(USR1, $::CCPID);
+ kill('USR1', $::CCPID);
$keyboard = '';
goto begin;
} else {
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 145be22ef..71841f882 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -28,7 +28,7 @@ if (!$::noauto) {
$mouse = $probed_mouse if !$mouse->{XMOUSETYPE} || !$probed_mouse->{unsafe};
}
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
if (!$mouse || !$::auto) {
$mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse");
if ($::isEmbedded && $in->isa('interactive::gtk')) {
@@ -44,7 +44,7 @@ if (!$mouse || !$::auto) {
sub { join '|', map { translate($_) } split '\|', $_[0] },
[ mouse::fullnames ],
$mouse->{type} . '|' . $mouse->{name});
- $name or $::isEmbedded ? do { kill(USR1, $::CCPID); goto begin } : $in->exit(0);
+ $name or $::isEmbedded ? do { kill('USR1', $::CCPID); goto begin } : $in->exit(0);
my $mouse_chosen = mouse::fullname2mouse($name);
$mouse = $mouse_chosen if !($mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name});
@@ -67,5 +67,5 @@ if (!$mouse || !$::auto) {
mouse::write_conf($mouse, 1);
system('service', 'gpm', 'restart') if -e '/var/lock/subsys/gpm';
-$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
+$::isEmbedded ? kill('USR1', $::CCPID) : $in->exit(0);
goto begin;
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 2bbee5c31..4917ea8c8 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -63,9 +63,9 @@ $commandline =~ /-pdq/ and
}
begin:
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
printerdrake::main($printer, $in, 1);
-$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
+$::isEmbedded ? kill('USR1', $::CCPID) : $in->exit(0);
goto begin;
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 3ff8d61fb..1f6242987 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -108,5 +108,5 @@ sub tryConfScanner {
}
sub quit {
- $::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
+ $::isEmbedded ? kill('USR1', $::CCPID) : $in->exit(0);
}
diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall
index ae3d11dd0..fdd85bee0 100755
--- a/perl-install/standalone/tinyfirewall
+++ b/perl-install/standalone/tinyfirewall
@@ -69,7 +69,7 @@ $bbox1->add($button_ok);
$window1->show_all();
update();
Gtk->main_iteration while Gtk->events_pending;
-$::isEmbedded and kill USR2, $::CCPID;
+$::isEmbedded and kill 'USR2', $::CCPID;
Gtk->main;
Gtk->exit(0);
@@ -85,7 +85,7 @@ Click on Configure to set up a standard firewall"));
}
sub quit_global {
- $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0);
+ $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0);
}
dd:
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-06 09:47:34 +0000