diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-01 09:29:46 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-01 09:29:46 +0000 |
| commit | 89639cec273d0f7a266991e62329a363e5ad5236 (patch) | |
| tree | 3176d7ca9d09eb48f3b6eb30c0107fb455424a17 | |
| parent | cab5f748752bba19fddabd658e052f14b5c17581 (diff) | |
| download | drakx-89639cec273d0f7a266991e62329a363e5ad5236.tar drakx-89639cec273d0f7a266991e62329a363e5ad5236.tar.gz drakx-89639cec273d0f7a266991e62329a363e5ad5236.tar.bz2 drakx-89639cec273d0f7a266991e62329a363e5ad5236.tar.xz drakx-89639cec273d0f7a266991e62329a363e5ad5236.zip | |
move harddrake service confirmation script from spec file into its own file
| -rw-r--r-- | perl-install/drakxtools.spec | 10 | ||||
| -rw-r--r-- | perl-install/standalone/service_harddrake_confirm | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec index 0340698aa..e9f303938 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -217,15 +217,7 @@ cat > $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/harddrake2 <<EOF exec /usr/share/harddrake/service_harddrake X11 EOF -cat > $RPM_BUILD_ROOT%_datadir/harddrake/confirm <<EOF -#!/usr/bin/perl -use lib qw(/usr/lib/libDrakX); -use interactive; - -my \$in = interactive->vnew; -my \$res = \$in->ask_okcancel(\$ARGV[0], \$ARGV[1], 1); -\$in->exit(\$res); -EOF +mv $RPM_BUILD_ROOT%_sbindir/service_harddrake_confirm $RPM_BUILD_ROOT%_datadir/harddrake/confirm chmod +x $RPM_BUILD_ROOT{%_datadir/harddrake/*,%_sysconfdir/X11/xinit.d/harddrake2} # temporary fix until we reenable this feature diff --git a/perl-install/standalone/service_harddrake_confirm b/perl-install/standalone/service_harddrake_confirm new file mode 100644 index 000000000..99eaf7b0f --- /dev/null +++ b/perl-install/standalone/service_harddrake_confirm @@ -0,0 +1,7 @@ +#!/usr/bin/perl +use lib qw(/usr/lib/libDrakX); +use interactive; + +my $in = interactive->vnew; +my $res = $in->ask_okcancel($ARGV[0], $ARGV[1], 1); +$in->exit($res); |