# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344017539 -7200 # Node ID 8fac5290decb113a435d1e41fecc514c1bcb4f9f # Parent f8813e60f168531e5fb2a646e152ea997aa83703 Correct typical english grammar mistakes in german linguistics. diff -r f8813e60f168 -r 8fac5290decb openpkg/rc --- a/openpkg/rc Fri Aug 03 20:11:53 2012 +0200 +++ b/openpkg/rc Fri Aug 03 20:12:19 2012 +0200 @@ -149,7 +149,7 @@ fi fi -# extend run-time environment with local OpenPKG tools (shtool, rpmtool, etc) +# extend runtime environment with local OpenPKG tools (shtool, rpmtool, etc) PATH_ORIG="$PATH" PATH="$prefix/lib/openpkg/fallback:$PATH" PATH="$prefix/bin:$PATH" @@ -160,7 +160,7 @@ # handle --query option if [ ".$query" = .1 ]; then # suck in all %config sections of all scripts - # (rc.openpkg is special: has to be first and requires pre-inclusion of rc.conf) + # (rc.openpkg is special: has to be first and requires preinclusion of rc.conf) touch $tmpfile sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d' echo ". $rcconf" >>$tmpfile @@ -187,7 +187,7 @@ # handle --config option if [ ".$config" = .1 ]; then # suck in all %config sections of all scripts - # (rc.openpkg is special: has to be first and requires pre-inclusion of rc.conf) + # (rc.openpkg is special: has to be first and requires preinclusion of rc.conf) touch $tmpfile sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d' echo ". $rcconf" >>$tmpfile @@ -271,11 +271,11 @@ quarterly|* ) delay=30; timeout=900 ;; # 30s / 15m esac - # apply random run-time delay + # apply random runtime delay # (hint: $RANDOM is a random value 0..32767) sleep $(( ($RANDOM * $delay) / 32767 )) - # wrap ourself for mutual exclusion run-time + # wrap ourself for mutual exclusion runtime # and then perform the "all" command cleanup exec $prefix/lib/openpkg/mutex \ @@ -305,7 +305,7 @@ fi fi -# determine current run-time user +# determine current runtime user user=`(id -un) 2>/dev/null ||\ (id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\ (whoami) 2>/dev/null ||\ @@ -318,7 +318,7 @@ # Avoid handing control to OpenPKG binary logic until # the binary is is ready for prime time on all platforms. -## just call OpenPKG RPM to let it once perform the run-time integrity checks +## just call OpenPKG RPM to let it once perform the runtime integrity checks #$prefix/bin/openpkg rpm -q openpkg >/dev/null || exit $? # iterate over the specified commands @@ -408,7 +408,7 @@ fi done - # if operating on all scripts, complain if a non-standard command + # if operating on all scripts, complain if a nonstandard command # was used and it was not found in any(!) script at all. The # standard commands are accepted to perform no operation if no # packages are currently installed which provide such commands. @@ -437,7 +437,7 @@ echo "set -x" >>$tmpfile fi - # generate: inclusion of the run-command helper functions + # generate: inclusion of the runcommand helper functions echo ". $rcfunc" >>$tmpfile # generate: all %config sections of all(!) scripts. We cannot @@ -445,7 +445,7 @@ # because by design all command scripts see the %config # section of all(!) scripts. Because of $openpkg_rc_def the # variable, we place the %config section of "openpkg" to the front. - # And we have to extra pre-include the rc.conf to allow + # And we have to extra preinclude the rc.conf to allow # rc.conf to override the default of $openpkg_rc_def, too. sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d' echo ". $rcconf" >>$tmpfile @@ -476,7 +476,7 @@ for entry in `echo $list | tr ',' '\012' | sort -n`; do [ ".$entry" = . ] && continue - # re-determine the script name, script and whether to print output + # redetermine the script name, script and whether to print output eval `echo $entry | sed -e 's%^[0-9]*:\(.*\):\(.*\):\(.*\)$%s_name="\1"; s_user="\2"; s_output="\3";%'` # display verbose progress message parts @@ -514,7 +514,7 @@ # special case: under --eval we just add the %common and # command scripts to the generated output script and do # not execute anything at this point. Additionally, we - # emulate a real sub-shell environment. + # emulate a real subshell environment. sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%common/d" -e '/^%.*/,$d' echo "while [ 1 ]; do" >>$tmpfile sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%$cmd/d" -e '/^%.*/,$d' \ @@ -534,7 +534,7 @@ echo "set -x" >>$tmpfile fi - # generate: inclusion of the run-command helper functions + # generate: inclusion of the runcommand helper functions echo ". $rcfunc" >>$tmpfile # generate: all %config sections of all(!) scripts. We cannot @@ -542,7 +542,7 @@ # because by design all command scripts see the %config # section of all(!) scripts. Because of $openpkg_rc_def the # variable, we place the %config section of "openpkg" to the front. - # And we have to extra pre-include the rc.conf to allow + # And we have to extra preinclude the rc.conf to allow # rc.conf to override the default of $openpkg_rc_def, too. sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d' echo ". $rcconf" >>$tmpfile @@ -578,9 +578,9 @@ elif [ ".@l_susr@" != ".root" ]; then # do not complain if we would not have any chance # at all to switch the user because we are running - # in a non-privileged instance. Else we would just + # in a unprivileged instance. Else we would just # trash the mailbox of the user receiving the - # output of periodic run-commands. + # output of periodic runcommands. rc=0 else echo "openpkg:rc:WARNING: $prefix:$s_name:%$cmd: require root privileges to run as user \"$s_user\"" 1>&2 @@ -641,7 +641,7 @@ fi done - # post-processing for each command + # postprocessing for each command if [ ".$print" = .1 ]; then # for --print just print the resulting script to stdout cat $tmpfile @@ -698,8 +698,8 @@ cp $outfile $tmpfile # for --eval we cannot just print the resulting script because - # not all Bourne-Shell implementations like to "eval" large - # multi-line outputs. Hence we output a little one-liner which + # not all Bourne Shell implementations like to "eval" large + # multiline outputs. Hence we output a little one liner which # "sources" the script instead and cleans up. case $SHELL in csh|*/csh|tcsh|*/tcsh )