- replace into %service and %useradd macros

Changed files:
    adapter.awk -> 1.295

diff --git a/adapter.awk b/adapter.awk
index 8772f199ce907edcc586aa239836306b680a87a9..32141d2623f9cc2310aefdfa7b3050d5e677541c 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -537,12 +537,18 @@ function b_makekey(a, b,  s) {
 /^%pre/, (!/^%pre/ && $0 ~ SECTIONS) {
        preamble = 0
 
+       if (gsub("/usr/sbin/useradd", "%useradd")) {
+               sub(" 2> /dev/null \|\| :", "");
+               sub(" >/dev/null 2>&1 \|\|:", "");
+       }
+
        # %useradd and %groupadd may not be wrapped
        if (/%(useradd|groupadd).*\\$/) {
                a = $0; getline;
                sub(/^[\s\t]*/, "");
                $0 = substr(a, 1, length(a) - 1) $0;
        }
+       use_script_macros()
 }
 
 /^%post/, (!/^%post/ && $0 ~ SECTIONS) {
@@ -551,30 +557,39 @@ function b_makekey(a, b,  s) {
 }
 /^%preun/, (!/^%preun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%postun/, (!/^%postun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerin/, (!/^%triggerin/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerun/, (!/^%triggerun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerpostun/, (!/^%triggerpostun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%pretrans/, (!/^%pretrans/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%posttrans/, (!/^%posttrans/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%verifyscript/, (!/^%verifyscript/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%check/, (!/^%check/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 
 #############
@@ -1332,6 +1347,14 @@ function use_files_macros(       i, n, t, a)
        gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}");
 }
 
+function use_script_macros()
+{
+       if (gsub("/sbin/service", "%service")) {
+               sub(" >/dev/null 2>&1 \|\|:", "");
+               sub(" 2> /dev/null \|\| :", "");
+       }
+}
+
 function fill(ch, n, i) {
        for (i = 0; i < n; i++)
                printf("%c", ch)