summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/XFdrake12
-rwxr-xr-xperl-install/standalone/adduserdrake4
-rwxr-xr-xperl-install/standalone/diskdrake4
-rwxr-xr-xperl-install/standalone/draksec4
-rwxr-xr-xperl-install/standalone/drakxconf2
-rw-r--r--perl-install/standalone/icons/findf.xpm57
-rw-r--r--perl-install/standalone/icons/ftin.xpm46
-rw-r--r--perl-install/standalone/icons/ftout.xpm46
-rwxr-xr-xperl-install/standalone/keyboarddrake2
-rwxr-xr-xperl-install/standalone/mousedrake6
-rwxr-xr-xperl-install/standalone/printerdrake12
11 files changed, 106 insertions, 89 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 99182ec85..b625647be 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -28,12 +28,12 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: XFdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
-$::beginner = /--beginner/;
-$::expert = /--expert/;
-$::auto = /--auto/;
-$::noauto = /--noauto/;
-$::skiptest = /--skiptest/;
-$::testing = /--testing/;
+$::beginner = /-beginner/;
+$::expert = /-expert/;
+$::auto = /-auto/;
+$::noauto = /-noauto/;
+$::skiptest = /-skiptest/;
+$::testing = /-testing/;
$::isStandalone = 1;
system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index 98c3ba3f9..490f09b7e 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -9,8 +9,8 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: adduserdrake [--beginner] [--expert]\n";
-$::beginner = /--beginner/;
-$::expert = /--expert/;
+$::beginner = /-beginner/;
+$::expert = /-expert/;
$::isStandalone = 1;
my $in = vnew interactive('su');
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 036fa500a..f4f1e0d5c 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -36,8 +36,8 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: XFdrake [--expert] [--testing]\n";
-$::expert = /--expert/;
-$::testing = /--testing/;
+$::expert = /-expert/;
+$::testing = /-testing/;
$::isStandalone = 1;
if ($>) {
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 5fc4cce86..04d332541 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -11,7 +11,7 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: draksec [--expert]\n";
-$::expert = /--expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE="?expert/m; #"
+$::expert = /-expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE="?expert/m; #"
$::isStandalone = 1;
my $in = vnew interactive('su');
@@ -28,7 +28,9 @@ delete @l{0,1,5} unless $::expert;
if (my $level = $in->ask_from_list('', _("Choose security level"), [ values %l ], $l{$ENV{SECURE_LEVEL}})) {
my $w = $in->wait_message('', _("Setting security level"));
+ $in->suspend;
system("/etc/security/msec/init.sh ". $m{$level});
+ $in->resume;
}
$in->exit(0);
diff --git a/perl-install/standalone/drakxconf b/perl-install/standalone/drakxconf
index 7a99b1ffc..8699b05a2 100755
--- a/perl-install/standalone/drakxconf
+++ b/perl-install/standalone/drakxconf
@@ -20,7 +20,7 @@ my $in = vnew interactive('su');
my $choice = $in->ask_from_list("drakxconf",
_("Choose the tool you want to use"),
[ grep { my $prog = $_; int grep { -x "$_/$prog" } split ":", $ENV{PATH} }
- qw(XFdrake adduserdrake diskdrake drakxservices keyboarddrake mousedrake netdrake printerdrake draksec adduserdrake) ]) or c::_exit(0); #- workaround for perl-GTK
+ qw(XFdrake adduserdrake diskdrake drakxservices keyboarddrake mousedrake netdrake printerdrake draksec) ]) or c::_exit(0); #- workaround for perl-GTK
$in->end;
diff --git a/perl-install/standalone/icons/findf.xpm b/perl-install/standalone/icons/findf.xpm
index 91b25cee5..792007335 100644
--- a/perl-install/standalone/icons/findf.xpm
+++ b/perl-install/standalone/icons/findf.xpm
@@ -1,28 +1,31 @@
/* XPM */
-/* Drawn by Nico Schwiring and Mark Donohoe for the K Desktop Environment */
-/* See http://www.kde.org */
-static char*kfind[]={
-"16 16 6 1",
-"# c #000000",
-"d c #c0c0c0",
-"a c #ffffff",
-"b c #0000ff",
-"c c #bebeff",
-". c None",
-".###########....",
-"#aaaaaaaaaaa#...",
-"#aaaaaaaabca#...",
-"#aaaaaaaaaba#...",
-"#aaaad###daa#...",
-"#aaad#aaa#da#...",
-"#aaa#acaca#a#...",
-"#aaa#abbaa#a#...",
-"#aaa#aabca#a#...",
-"#aaad#aaa##a#...",
-"#bcaad####a##...",
-"#abaaaaaaa#a#...",
-"#aaaaaaaaaa#a#..",
-"#aabcaaaaaaa#a#.",
-".###########.#a#",
-"..............#."};
-
+static char * findf_xpm[] = {
+"16 22 6 1",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+"@ c #0000FF",
+"# c #BEBEFF",
+"$ c #C0C0C0",
+" ",
+" ",
+" ",
+" ........... ",
+".+++++++++++. ",
+".++++++++@#+. ",
+".+++++++++@+. ",
+".++++$...$++. ",
+".+++$.+++.$+. ",
+".+++.+#+#+.+. ",
+".+++.+@@++.+. ",
+".+++.++@#+.+. ",
+".+++$.+++..+. ",
+".@#++$....+.. ",
+".+@+++++++.+. ",
+".++++++++++.+. ",
+".++@#+++++++.+. ",
+" ........... .+.",
+" . ",
+" ",
+" ",
+" "};
diff --git a/perl-install/standalone/icons/ftin.xpm b/perl-install/standalone/icons/ftin.xpm
index e70d56d19..d0326d3ce 100644
--- a/perl-install/standalone/icons/ftin.xpm
+++ b/perl-install/standalone/icons/ftin.xpm
@@ -1,24 +1,30 @@
/* XPM */
-static char * kmfolderin_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"15 13 5 1",
-/* colors */
+static char * ftin_xpm[] = {
+"15 22 5 1",
" c None",
-". c red3",
-"X c white",
-"o c #c0c0c0",
-"O c #808080",
-/* pixels */
+". c #CD0000",
+"+ c #FFFFFF",
+"@ c #C0C0C0",
+"# c #808080",
+" ",
+" ",
+" ",
+" ",
+" ",
" . . ",
" ... ",
-" ...XXXXXXXX",
-" ...ooooooXX",
-" .......XXXXXO",
-" .....oooXXOX",
-" XX...XXXXXOXO",
-" Xooo.oooXXOXOX",
-"XXXXXXXXXXOXOX ",
-"OOOOOOOOOOXOX ",
-"XXXXXXXXXXOX ",
-"OOOOOOOOOOX ",
-"XXXXXXXXXX "};
+" ...++++++++",
+" ...@@@@@@++",
+" .......+++++#",
+" .....@@@++#+",
+" ++...+++++#+#",
+" +@@@.@@@++#+#+",
+"++++++++++#+#+ ",
+"##########+#+ ",
+"++++++++++#+ ",
+"##########+ ",
+"++++++++++ ",
+" ",
+" ",
+" ",
+" "};
diff --git a/perl-install/standalone/icons/ftout.xpm b/perl-install/standalone/icons/ftout.xpm
index db28a8e5d..b4e0135b8 100644
--- a/perl-install/standalone/icons/ftout.xpm
+++ b/perl-install/standalone/icons/ftout.xpm
@@ -1,24 +1,30 @@
/* XPM */
-static char * kmfolderout_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"15 13 5 1",
-/* colors */
+static char * ftout_xpm[] = {
+"15 22 5 1",
" c None",
-". c blue4",
-"X c white",
-"o c #c0c0c0",
-"O c #808080",
-/* pixels */
+". c #00008B",
+"+ c #FFFFFF",
+"@ c #C0C0C0",
+"# c #808080",
+" ",
+" ",
+" ",
+" ",
+" ",
" . ",
" ... ",
-" .....XXXXXXX",
-" .......ooooXX",
-" ...XXXXXXXO",
-" X...ooooXXOX",
-" XX...XXXXXOXO",
-" Xoo.X.ooXXOXOX",
-"XXXXXXXXXXOXOX ",
-"OOOOOOOOOOXOX ",
-"XXXXXXXXXXOX ",
-"OOOOOOOOOOX ",
-"XXXXXXXXXX "};
+" .....+++++++",
+" .......@@@@++",
+" ...+++++++#",
+" +...@@@@++#+",
+" ++...+++++#+#",
+" +@@.+.@@++#+#+",
+"++++++++++#+#+ ",
+"##########+#+ ",
+"++++++++++#+ ",
+"##########+ ",
+"++++++++++ ",
+" ",
+" ",
+" ",
+" "};
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 96d345ae6..d2177b459 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -13,7 +13,7 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: keyboarddrake [--expert]\n";
-$::expert = /--expert/;
+$::expert = /-expert/;
$::isStandalone = 1;
my $in = vnew interactive('su');
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 9e39557f8..1682295e1 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -11,9 +11,9 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: mousedrake [--auto] [--noauto] [--testing]\n";
-$::auto = /--auto/;
-$::noauto = /--noauto/;
-$::testing = /--testing/;
+$::auto = /-auto/;
+$::noauto = /-noauto/;
+$::testing = /-testing/;
$::isStandalone = 1;
my $in = vnew interactive('su');
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 6f5a03218..76caa66c1 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -28,12 +28,12 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
-$::beginner = /--beginner/;
-$::expert = /--expert/;
-$::auto = /--auto/;
-$::noauto = /--noauto/;
-$::skiptest = /--skiptest/;
-$::testing = /--testing/;
+$::beginner = /-beginner/;
+$::expert = /-expert/;
+$::auto = /-auto/;
+$::noauto = /-noauto/;
+$::skiptest = /-skiptest/;
+$::testing = /-testing/;
$::isStandalone = 1;
my $in = vnew interactive('su');
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-03 17:00:32 +0000