fixed rpmpopt: replace hard-coded bash path and do not use reserved shell keywords

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040427 fixed rpmpopt: replace hard-coded bash path and do not use reserved shell keywords
 20040426 upgrade to cURL 7.11.2
 20040422 backout added hack to "rpmtool cflags -O" processing because it was incorrect
 20040421 add hack to "rpmtool cflags -O" processing because Tru64 doesn't know plain "-O" option

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040426
+%define       V_openpkg  20040427
 
 #   the used software versions
 %define       V_rpm      4.2.1

openpkg/rpmpopt

@@ -79,7 +79,7 @@ rpm alias --track-dump -bt --define '___track_dump yes' \
 
 #   RPM extension: "rpm --test"
 rpm alias --test -q --qf '%{TEST}\n' \
-    --pipe "grep -v \(none\) | /openpkg-dev/lib/openpkg/bash" \
+    --pipe "grep -v \(none\) | @l_prefix@/lib/openpkg/bash" \
     --POPTdesc=$"run package run-time test script (%test)"
 
 #   RPM adjustment: "rpm --setperms ..."
@@ -90,8 +90,8 @@ rpm alias --setperms -q --qf \
 
 #   RPM adjustment: "rpm --setugids ..."
 rpm alias --setugids -q --qf \
-    '[do %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \
-    --pipe "(echo 'do () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }'; grep -v '(none)') | @l_prefix@/lib/openpkg/bash" \
+    '[run %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \
+    --pipe "(echo 'run () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }'; grep -v '(none)') | @l_prefix@/lib/openpkg/bash" \
     --POPTdesc=$"set user/group ownership of files in a package"
 
 #   RPM adjustment: improved and cleaned up "rpm -i/--info"