Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 678939 Details for
Bug 524698
app-admin/tmpwatch with dash - /etc/cron.daily/tmpwatch: 33: /etc/cron.daily/tmpwatch: [[: not found
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gentoo-bug-524698.patch
gentoo-bug-524698.patch (text/plain), 3.45 KB, created by
kfm
on 2020-12-20 15:17:02 UTC
(
hide
)
Description:
gentoo-bug-524698.patch
Filename:
MIME Type:
Creator:
kfm
Created:
2020-12-20 15:17:02 UTC
Size:
3.45 KB
patch
obsolete
>commit 1c56156ce733ba4fb794fb38a25e38375208c5cb >Author: Kerin Millar <kfm@plushkava.net> >Date: Sun Dec 20 17:12:14 2020 +0200 > > app-admin/tmpwatch: address bug 524698 > > Remove the use of the [[ keyword in favour of the POSIX test command > (SC3010). > > Don't hard-code pathnames to external programs and define silly > variables such as TMPWATCH. Instead, define a sane PATH at the beginning > of the script. > > Don't force the user to reason with whether certain variables need to be > set or not. Instead, call out to portageq in the samples. Further, check > the exit status of portageq, rather than blindly assume that it always > succeeds. As a result, there are no more hard-coded paths, other than > /tmp. > > Use pgrep in a less sloppy way. > > Query PORT_LOGDIR if the query for PORTAGE_LOGDIR fails. > > Closes: https://bugs.gentoo.org/524698 > Signed-off-by: Kerin Millar <kfm@plushkava.net> > >diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron >index 806b1453e552..d35a590379d7 100644 >--- a/app-admin/tmpwatch/files/tmpwatch.cron >+++ b/app-admin/tmpwatch/files/tmpwatch.cron >@@ -1,47 +1,45 @@ > #!/bin/sh >-# vim: ft=sh >+ >+PATH="/usr/sbin:/usr/bin:/sbin:/bin" > > # This cron script contains several (commented out) examples. You may use > # them as is, by uncommenting them, or modify them to suit your needs. Read > # tmpwatch(8) for more information on tmpwatch parameters. > >-### Variables ### >- >-TMPWATCH="/usr/sbin/tmpwatch" >-#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage" >-#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)" >-#DISTDIR="$(portageq distdir)" >- > ### EXAMPLES ### > > # NOTE: if you have noatime in /etc/fstab for any partitions you plan on > # running tmpwatch on, you should obviously change any of the examples that > # use atime (-u|--atime). Those that don't specify anything, default to >-# atime. >- >-# NOTE2: the time value is in HOURS! >+# atime. Be aware that the time value is in HOURS! > > # Delete everything in /tmp that haven't been accessed in a week (>=168 hrs). > # >-# if [[ -d /tmp ]]; then >-# ${TMPWATCH} --atime 168 /tmp >+# if [ -d /tmp ]; then >+# tmpwatch --atime 168 /tmp > # fi > > # Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks. > # >-# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then >-# ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage} >+# if PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR) && >+# [ -d "${PORTAGE_TMPDIR}/portage" ] && >+# ! pgrep -x emerge >/dev/null >+# then >+# tmpwatch --mtime --all 336 "${PORTAGE_TMPDIR}/portage" > # fi > > # Delete everything in DISTDIR that hasn't been accessed in 6 months (going >-# by 30 day months) >+# by 30 day months). > # >-# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then >-# ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles} >+# if DISTDIR=$(portageq distdir) && [ -d "${DISTDIR}" ]; then >+# tmpwatch --atime --fuser 4320 "${DISTDIR}" > # fi > >-# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks >+# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks. > # >-# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then >-# ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage} >+# if { PORTAGE_LOGDIR=$(portageq envvar PORTAGE_LOGDIR) || >+# PORTAGE_LOGDIR=$(portageq envvar PORT_LOGDIR); } && >+# [ -d "${PORTAGE_LOGDIR}" ] >+# then >+# tmpwatch --atime 772 "${PORTAGE_LOGDIR}" > # fi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 524698
: 678939