OpenPKG Specs / changeset

     1.1 --- a/openpkg/openpkg.boot	Thu Aug 02 01:32:22 2012 +0200
     1.2 +++ b/openpkg/openpkg.boot	Thu Aug 02 01:36:44 2012 +0200
     1.3 @@ -32,7 +32,7 @@
     1.4  #   Also keep in mind that lots of tricks are played here in order to
     1.5  #   perform all the steps without having to touch the real installation
     1.6  #   location. That is the whole procedure can (and should) be performed
     1.7 -#   by a non-privileged user and no access to the real installation
     1.8 +#   by a nonprivileged user and no access to the real installation
     1.9  #   location filesystem location.
    1.10  
    1.11  me="openpkg.boot"
    1.12 @@ -257,7 +257,7 @@
    1.13  sh ./etc.prereq.sh source || exit $?
    1.14  
    1.15  ##
    1.16 -##  find reasonable run-time paths and tools
    1.17 +##  find reasonable runtime paths and tools
    1.18  ##
    1.19  
    1.20  #   find reasonable temporary directory
    1.21 @@ -343,7 +343,7 @@
    1.22  ) | sed -e 's;%{\([^}]*\)};${\1};g' >$prolog
    1.23  
    1.24  #   install package via RPM spec file by faking a
    1.25 -#   sufficiently enough RPM run-time environment
    1.26 +#   sufficiently enough RPM runtime environment
    1.27  runscript () {
    1.28      step=$1
    1.29      script="$tmpdir/openpkg.boot.$step.sh"
    1.30 @@ -361,7 +361,7 @@
    1.31      sh $script
    1.32      if [ $? -ne 0 ]; then
    1.33          rm -f $script
    1.34 -        echo "$0:ERROR: script returned non-null value"
    1.35 +        echo "$0:ERROR: script returned nonnull value"
    1.36          exit 1
    1.37      fi
    1.38      rm -f $script
    1.39 @@ -478,11 +478,11 @@
    1.40      --build --quiet
    1.41  
    1.42  ##
    1.43 -##   now turn over and re-iterate over the RPM spec, but this time
    1.44 +##   now turn over and reiterate over the RPM spec, but this time
    1.45  ##   with the real RPM tool.
    1.46  ##
    1.47  
    1.48 -echo "++ re-iterating over RPM specification procedures"
    1.49 +echo "++ reiterating over RPM specification procedures"
    1.50  $tmpdir/rpm -bb $spec
    1.51  
    1.52  ##
    1.53 @@ -494,7 +494,7 @@
    1.54  ##   would create an incorrect filelist for "rpm" in the database.
    1.55  ##   Instead we use the --justdb option which means "rpm" behaves as it
    1.56  ##   would install into the real location, but does not actually install
    1.57 -##   anything. But as a side-effect, the database is now correct.
    1.58 +##   anything. But as a side effect, the database is now correct.
    1.59  ##
    1.60  
    1.61  echo "++ overwriting RPM installation by installing via RPM itself"
    1.62 @@ -518,18 +518,18 @@
    1.63     pkgdir=..
    1.64  fi
    1.65  
    1.66 -#   create Source-RPM file
    1.67 +#   create Source RPM file
    1.68  echo "++ creating bootstrap source RPM file"
    1.69  $tmpdir/rpm -bs --nodeps --define "_srcrpmdir $pkgdir" $spec
    1.70  
    1.71 -#   create Binary-RPM file
    1.72 +#   create Binary RPM file
    1.73  #   (notice that there might be a discrepancy in the platform
    1.74  #   identification, so we have to copy the source via wildcard)
    1.75  echo "++ creating bootstrap binary RPM file"
    1.76  cp $RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm $pkgdir/openpkg-$v.$t.rpm
    1.77  rm -f $RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm
    1.78  
    1.79 -#   create Binary-Bootstrap file
    1.80 +#   create binary bootstrap file
    1.81  echo "++ creating bootstrap binary shell script"
    1.82  files=`cat $spec |\
    1.83         sed -e '1,/%files/d' -e '/%clean/,$d' |\