diff options
author | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
commit | 62bb1062226d3ce6a2350808256a25508978352d (patch) | |
tree | 22b131dceb13c3df96da594fbaadb693504797c7 /usr.sbin/portsnap | |
parent | 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff) | |
parent | 04932445481c2cb89ff69a83b961bdef3d64757e (diff) | |
download | FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz |
Merge from head
Diffstat (limited to 'usr.sbin/portsnap')
-rw-r--r-- | usr.sbin/portsnap/portsnap/portsnap.8 | 10 | ||||
-rw-r--r-- | usr.sbin/portsnap/portsnap/portsnap.sh | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8 index da94efc..baa1a57 100644 --- a/usr.sbin/portsnap/portsnap/portsnap.8 +++ b/usr.sbin/portsnap/portsnap/portsnap.8 @@ -169,7 +169,9 @@ If your clock is set to local time, adding the line .Pp .Dl 0 3 * * * root /usr/sbin/portsnap cron .Pp -to /etc/crontab is a good way to make sure you always have +to +.Pa /etc/crontab +is a good way to make sure you always have an up-to-date snapshot of the ports tree available which can quickly be extracted into .Pa /usr/ports . @@ -247,11 +249,11 @@ may be published, but only in aggregate and after anonymizing the individual systems. .Sh FILES .Bl -tag -width "/etc/portsnap.conf" -.It /etc/portsnap.conf +.It Pa /etc/portsnap.conf Default location of the portsnap configuration file. -.It /var/db/portsnap +.It Pa /var/db/portsnap Default location where compressed snapshots are stored. -.It /usr/ports +.It Pa /usr/ports Default location where the ports tree is extracted. .El .Sh SEE ALSO diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh index f9f4716..14e5441 100644 --- a/usr.sbin/portsnap/portsnap/portsnap.sh +++ b/usr.sbin/portsnap/portsnap/portsnap.sh @@ -864,8 +864,8 @@ fetch_update() { echo "done." # Remove files which are no longer needed - cut -f 2 -d '|' tINDEX INDEX | sort > oldfiles - cut -f 2 -d '|' tINDEX.new INDEX.new | sort | comm -13 - oldfiles | + cut -f 2 -d '|' tINDEX INDEX | sort -u > oldfiles + cut -f 2 -d '|' tINDEX.new INDEX.new | sort -u | comm -13 - oldfiles | lam -s "files/" - -s ".gz" | xargs rm -f rm patchlist filelist oldfiles @@ -1113,7 +1113,7 @@ cmd_alfred() { else cmd_cron fi - if [ -d ${PORTSDIR} ]; then + if [ -r ${PORTSDIR}/.portsnap.INDEX ]; then cmd_update else cmd_extract |