Selaa lähdekoodia

POSIX compliance: replace "head -1" with "sed -e q" and "tail -1" with "sed -n -e $p

Ralf S. Engelschall 21 vuotta sitten
vanhempi
commit
a47185d14b
9 muutettua tiedostoa jossa 21 lisäystä ja 19 poistoa
  1. 2 0
      openpkg/HISTORY
  2. 1 1
      openpkg/aux.prereq.sh
  3. 1 1
      openpkg/install.sh
  4. 3 3
      openpkg/openpkg.boot
  5. 1 1
      openpkg/openpkg.spec
  6. 1 1
      openpkg/rc
  7. 8 8
      openpkg/rpmmacros
  8. 1 1
      openpkg/rpmtool
  9. 3 3
      openpkg/shtool

+ 2 - 0
openpkg/HISTORY

@@ -2,6 +2,8 @@
 2004
 ====
 
+20040421 POSIX compliance: replace "head -1" with "sed -e 'q'" and "tail -1" with "sed -n -e '$p'"
+
 20040418 **** RELEASE AS PART OF OPENPKG 2.0.2 ***
 20040418 port RPM to Tru64 5.1 (again) (excluded in 2.0.2)
 20040418 remove left-over object files from RPM distribution tarball before building

+ 1 - 1
openpkg/aux.prereq.sh

@@ -84,7 +84,7 @@ fi
 fs_free=""
 case "$platform_tech" in
     *-freebsd* | *-linux* | *-sunos* )
-       fs_free=`cd $fs_path && /bin/df -k . | tail -1  | awk '{ print $4; }'`
+       fs_free=`cd $fs_path && /bin/df -k . | sed -n -e '$p' | awk '{ print $4; }'`
        ;;
 esac
 if [ ".$fs_free" != . ]; then

+ 1 - 1
openpkg/install.sh

@@ -77,7 +77,7 @@ for pkg in openpkg make binutils gcc perl openpkg-tools; do
                 -e "s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" \
                 -e "s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.sh.*;\\2:\\1;" \
                 -e "s;^X.*;;" |\
-            sort -r | head -1 |\
+            sort -r | sed -e 'q' |\
             sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
         if [ ".$pkg_name" != . ]; then
             pkg_srpm="$url/$pkg_name.src.rpm"

+ 3 - 3
openpkg/openpkg.boot

@@ -129,7 +129,7 @@ fi
 
 name="openpkg"
 spec="$name.spec"
-version=`grep V_openpkg $spec | head -1 | awk '{ printf("%s", $3); }'`
+version=`grep V_openpkg $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
 release="$version"
 
 ##
@@ -216,7 +216,7 @@ fi
 ##  determine distribution directory
 ##
 
-V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
+V_rpm=`grep V_rpm $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
 if [ -f "../../dst/openpkg/rpm-${V_rpm}.tar.gz" ]; then
     distdir="`cd ../../dst/openpkg; pwd`" # developer only
 else
@@ -454,7 +454,7 @@ echo "%l_prefix $prefix" >>$tmpdir/rpm.3
 
 #   use an own $HOME/.popt in order to make sure the "rpm"
 #   tool is able to execute its sub-tools "rpm<x>".
-V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
+V_rpm=`grep V_rpm $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
 sed <$RPM_BUILD_ROOT$prefix/lib/openpkg/rpmpopt >$tmpdir/.popt \
     -e "s;^\\(rpm.*exec.*\\)\\(rpm[bdieukvq]*\\);\\1$RPM_BUILD_ROOT$prefix/lib/openpkg/\\2;"
 

+ 1 - 1
openpkg/openpkg.spec

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

+ 1 - 1
openpkg/rc

@@ -307,7 +307,7 @@ for cmd in $cmds; do
 
         #   parse global script options
         #   (currently unused in OpenPKG)
-        #shebangline=`head -1 $rcdir/rc.$s_name | grep "^#!rc"`
+        #shebangline=`sed -e 'q' $rcdir/rc.$s_name | grep "^#!rc"`
         #if [ ".$shebangline" != . ]; then
         #    shebangopts=`echo "$shebangline" | sed -e "s;^#!rc *;;"`
         #    set -- $shebangopts;

+ 8 - 8
openpkg/rpmmacros

@@ -102,26 +102,26 @@
 #   the *S*uper-user user/group name/id pair
 %l_susr                  @SUSR@
 %l_sgrp                  @SGRP@
-%l_suid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_susr}:" | head -1 | awk -F: '{ print $3; }')
-%l_sgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_sgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_suid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_susr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_sgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_sgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
 
 #   the *M*anagement user/group name/id pair
 %l_musr                  @MUSR@
 %l_mgrp                  @MGRP@
-%l_muid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_musr}:" | head -1 | awk -F: '{ print $3; }')
-%l_mgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_mgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_muid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_musr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_mgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_mgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
 
 #   the *R*restricted user/group name/id pair
 %l_rusr                  @RUSR@
 %l_rgrp                  @RGRP@
-%l_ruid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_rusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_rgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_rgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_ruid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_rusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_rgid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_rgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
 
 #   the *N*on-privileged user/group name/id pair
 %l_nusr                  @NUSR@
 %l_ngrp                  @NGRP@
-%l_nuid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_nusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_ngid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_ngrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_nuid                  %((getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep "^%{l_nusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_ngid                  %((getent group;  cat /etc/group;  ypcat group)  2>/dev/null | grep "^%{l_ngrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
 
 #   backward compatibility (openpkg < 20020204)
 %l_fsusr                 %{l_musr}

+ 1 - 1
openpkg/rpmtool

@@ -439,7 +439,7 @@ case $tool in
     cflags )
         tool="$1"
         isgcc=no
-        if [ ".`$tool --version 2>/dev/null | egrep '(2.[7-9]|3.[0-3])'`" != . ]; then
+        if [ ".`$tool --version 2>/dev/null | egrep '(2.[7-9]|3.[0-5])'`" != . ]; then
             isgcc=yes
         fi
         cflags=''

+ 3 - 3
openpkg/shtool

@@ -2646,7 +2646,7 @@ platform )
             v_kern=`echo "${UNAME_RELEASE}" |\
                 sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`
             v_libc=`(strings /lib/libc.so.* | grep '^GLIBC_' | sed -e 's/^GLIBC_//' |\
-                sort -n | tail -1 | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') 2>/dev/null`
+                sort -n | sed -n -e '$p' | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') 2>/dev/null`
             ST="GNU/<Linux >${v_libc}/<${v_kern}>"
             if [ -f /etc/lsb-release ]; then
                 eval `( . /etc/lsb-release
@@ -2666,7 +2666,7 @@ platform )
                     [ ".${tagfile}" = .x ] && continue
                     [ ! -f "/etc/${tagfile}" ] && continue
                     n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'`
-                    v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | head -1 |\
+                    v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | sed -e 'q' |\
                        sed -e 's/^/#/' \
                            -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
                            -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
@@ -2825,7 +2825,7 @@ platform )
                 alpha ) AP="Alpha" ;;
             esac
             alpha_type=`(/usr/sbin/psrinfo -v) 2>/dev/null |\
-                sed -n -e 's/^.*The alpha \([^ ][^ ]*\).*processor.*$/\1/p' | head -n 1`
+                sed -n -e 's/^.*The alpha \([^ ][^ ]*\).*processor.*$/\1/p' | sed -e 'q'`
             AT="${AP}${alpha_type}"
             AC="${AP}"
             #   determine system