New Features
============ 1. Add -t mode to "thoroughly" recurse dependencies, using the all-depends-list target instead of the combination of the build-depends-list and run-depends-list targets. This is useful when the dependencies of a dependency need to be updated, but the dependency itself doesn't; and -a mode is impractical for whatever reason. 2. If pkg_create fails, give the user the option of how to handle it: fail, or ignore the error. Improvements ============ 1. If we are trying to delete distfiles, but a dist subdir has gone missing, assume that the files are safely deleted (and inform the user) rather than error'ing out. 2. Search for BROKEN state before FORBIDDEN state, since if the former is set, the latter is implied, which made the error message confusing. While I'm here, trim the error message by removing some redundant information. 3. After successful install, before the dependencies are updated, apply the same search pattern whether we're updating an existing port, or installing from scratch using -p /usr/ports/foo/bar. Otherwise, existing dependencies for a port that was forcibly pkg_delete'd won't be updated, nor will the newly installed port's +REQUIRED_BY file be up to date. Fix === 1. The file that contains the checksums is not always spelled "distinfo," so use the MD5_FILE variable to find it Cleanups ======== 1. Further local'ize variables in functions, and factor in some variables there were used only once. Add more comments that describe usage of variables with global scope used in a function. 2. Twiddle white space a little more to help key messages stand out better, and change wording on one message to (hopefully) make it more clear. 3. Bump copyright
This commit is contained in:
Doug Barton
parent
a6f6233023
commit
f81e229109
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181903
2 changed files with 124 additions and 52 deletions
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Local version: 1.140
|
||||
# Local version: 1.147
|
||||
# $FreeBSD$
|
||||
|
||||
# Copyright (c) 2005-2006 Douglas Barton, All rights reserved
|
||||
# Copyright (c) 2005-2007 Douglas Barton, All rights reserved
|
||||
# Please see detailed copyright below
|
||||
|
||||
trap trap_exit INT
|
||||
|
|
@ -28,11 +28,10 @@ export PATH
|
|||
umask 022
|
||||
|
||||
usage () {
|
||||
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
|
||||
echo "portmaster version $VERSION_NUMBER"
|
||||
echo "portmaster version `grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`"
|
||||
echo ''
|
||||
echo 'Usage:'
|
||||
echo "Common flags: [-CGgnv B|b uf|i D|d] [-m <arguments for make>]"
|
||||
echo "Common flags: [-CGgntv B|b uf|i D|d] [-m <arguments for make>]"
|
||||
echo "${0##*/} [Common flags] <full name of port directory in $pdb>"
|
||||
echo "${0##*/} [Common flags] <full path to $pd/foo/bar>"
|
||||
echo "${0##*/} [Common flags] Multiple full names/paths from $pdb|$pd"
|
||||
|
|
@ -59,6 +58,7 @@ usage () {
|
|||
echo '-b create and keep a backup package of an installed port'
|
||||
echo '-g create a package of the new port'
|
||||
echo '-n do not actually make or install any ports'
|
||||
echo '-t recurse dependencies thoroughly, using all-depends-list'
|
||||
echo '-v verbose output'
|
||||
echo "-u unattended mode -- accept defaults for all but 'make config'"
|
||||
echo '-f always rebuild ports (overrides -i)'
|
||||
|
|
@ -131,6 +131,7 @@ trap_exit () {
|
|||
local pid
|
||||
|
||||
if [ -n "$portdir" ]; then
|
||||
echo ''
|
||||
echo "===>>> Upgrade for $portdir exiting due to signal"
|
||||
else
|
||||
echo "===>>> Exiting due to signal"
|
||||
|
|
@ -484,13 +485,15 @@ ports_by_category () {
|
|||
|
||||
dependency_check () {
|
||||
# Re-use dep_port_list for efficiency
|
||||
local dep_port ign_p cur_p upd_args p op old_p conflicts glob conflict_port
|
||||
local dl_type dep_port ign_p cur_p upd_args p op old_p conflicts glob conflict_port
|
||||
|
||||
# Print a message here because sometimes list generation takes
|
||||
# a long time to return.
|
||||
if [ -z "$dep_port_check_done" ]; then
|
||||
dl_type='build-depends-list run-depends-list'
|
||||
[ -n "$RECURSE_THOROUGH" ] && dl_type=all-depends-list
|
||||
echo "===>>> Gathering dependency list for $portdir from ports"
|
||||
dep_port_list=`make $MAKE_ARGS build-depends-list run-depends-list | sort -u`
|
||||
dep_port_list=`make $MAKE_ARGS $dl_type | sort -u`
|
||||
dep_port_check_done=yes
|
||||
fi
|
||||
|
||||
|
|
@ -645,7 +648,7 @@ find_and_delete_distfiles () {
|
|||
case "$distfiles" in
|
||||
*${file}*)
|
||||
if [ -n "$VERBOSE" -a -z "$do_delete" ]; then
|
||||
echo "===>>> Keeping new distfile: $file"
|
||||
echo "===>>> Keeping current distfile: $file"
|
||||
fi
|
||||
continue # Do not delete current version
|
||||
;;
|
||||
|
|
@ -678,7 +681,15 @@ delete_stale_distfiles () {
|
|||
# we do not delete the current set of distfiles
|
||||
distfiles=`make $MAKE_ARGS -V ALLFILES`
|
||||
|
||||
if [ -d "$distdir" ]; then
|
||||
cd $distdir || fail "cd to $distdir failed!"
|
||||
else
|
||||
echo '' ; echo ''
|
||||
echo "===>>> $distdir does not exist, therefore we"
|
||||
echo " will assume that all relevant distfiles are gone."
|
||||
echo ''
|
||||
return 0
|
||||
fi
|
||||
|
||||
# If these two match, it means that the distfiles in the +CONTENTS
|
||||
# file are the current set, so do not delete them.
|
||||
|
|
@ -713,6 +724,7 @@ delete_all_distfiles () {
|
|||
local DELORNOT
|
||||
|
||||
if ! cd $pd/$1; then
|
||||
echo ''
|
||||
echo "===>>> No $pd/$1 to cd to in order to delete"
|
||||
echo " old distfiles, remove by hand if desired"
|
||||
else
|
||||
|
|
@ -737,8 +749,10 @@ delete_all_distfiles () {
|
|||
}
|
||||
|
||||
backup_package () {
|
||||
# pkgrep and bu_pkg_name are used globally
|
||||
|
||||
echo "===>>> Creating a backup package for old version $1"
|
||||
pkg_create -b $1 || fail "Backup package creation failed for $1"
|
||||
if pkg_create -b $1; then
|
||||
[ -z "$pkgrep" ] &&
|
||||
pkgrep=`make $MAKE_ARGS -f $pd/Mk/bsd.port.mk -V PKGREPOSITORY`
|
||||
if [ ! -d "$pkgrep" ]; then
|
||||
|
|
@ -747,6 +761,25 @@ backup_package () {
|
|||
bu_pkg_name=`echo ${1}.*`
|
||||
mv $bu_pkg_name $pkgrep/ &&
|
||||
echo " ===>>> Package can be found in $pkgrep"
|
||||
else
|
||||
local PROCEED
|
||||
|
||||
if [ -z "$UNATTENDED" ]; then
|
||||
echo ''
|
||||
echo "===>>> Backup package creation failed for ${1}!"
|
||||
echo ''
|
||||
echo "===>>> Ignore this error [i]"
|
||||
echo "===>>> Abort update [a]"
|
||||
echo ''
|
||||
echo -n "===>>> How would you like to proceed? [i] "
|
||||
read PROCEED
|
||||
case "$PROCEED" in
|
||||
a) fail "Backup package creation failed for $1" ;;
|
||||
esac
|
||||
else
|
||||
fail "Backup package creation failed for $1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pd=`make $MAKE_ARGS -f/dev/null -V PORTSDIR 2>/dev/null`
|
||||
|
|
@ -767,7 +800,7 @@ fi
|
|||
: ${pdb:=/var/db/pkg}
|
||||
|
||||
# Save switches for potential child processes
|
||||
while getopts 'BCDGLabde:fghilm:nop:r:suv' COMMAND_LINE_ARGUMENT ; do
|
||||
while getopts 'BCDGLabde:fghilm:nop:r:stuv' COMMAND_LINE_ARGUMENT ; do
|
||||
case "${COMMAND_LINE_ARGUMENT}" in
|
||||
B) NO_BACKUP=yes; ARGS="-B $ARGS" ;;
|
||||
C) DONT_PRE_CLEAN=yes; ARGS="-C $ARGS" ;;
|
||||
|
|
@ -795,6 +828,7 @@ while getopts 'BCDGLabde:fghilm:nop:r:suv' COMMAND_LINE_ARGUMENT ; do
|
|||
p) portdir="${OPTARG#$pd/}" ;;
|
||||
r) UPDATE_REQ_BYS=yes; upg_port=$OPTARG ;;
|
||||
s) CLEAN_STALE=yes ;;
|
||||
t) RECURSE_THOROUGH=yes; ARGS="-t $ARGS" ;;
|
||||
u) UNATTENDED=yes; ARGS="-u $ARGS" ;;
|
||||
v) VERBOSE=yes; ARGS="-v $ARGS" ;;
|
||||
*) usage ;;
|
||||
|
|
@ -1172,11 +1206,11 @@ fi
|
|||
|
||||
cd $pd/$portdir || usage
|
||||
|
||||
for state in FORBIDDEN IGNORE BROKEN; do
|
||||
for state in FORBIDDEN BROKEN IGNORE; do
|
||||
state_set=`make -V $state`
|
||||
if [ -n "$state_set" ]; then
|
||||
echo "===>>> This port is marked $state:"
|
||||
echo "===>>> $portdir $state_set"
|
||||
echo "===>>> $state_set"
|
||||
echo "===>>> If you are sure you can build it, remove the"
|
||||
echo " $state line in the Makefile and try again."
|
||||
safe_exit 1
|
||||
|
|
@ -1331,11 +1365,12 @@ short_port="${prefix}${portname}${suffix}"
|
|||
# Check for dependencies here in case +REQUIRED_BY is not up to date or missing
|
||||
grep_deps=`mktemp -t grep-deps-${short_port}`
|
||||
|
||||
upg_origin=$portdir
|
||||
if [ -n "$upg_port" ]; then
|
||||
upg_origin=`origin_from_pdb $pdb/$upg_port`
|
||||
grep -l DEPORIGIN:$upg_origin$ $pdb/*/+CONTENTS | cut -f 5 -d '/' |
|
||||
sort -u > $grep_deps
|
||||
fi
|
||||
grep -l DEPORIGIN:$upg_origin$ $pdb/*/+CONTENTS | cut -f 5 -d '/' |
|
||||
sort -u > $grep_deps
|
||||
|
||||
if [ -s "$pdb/$upg_port/+REQUIRED_BY" ]; then
|
||||
req_deps=`mktemp -t req-deps-${short_port}`
|
||||
|
|
@ -1410,10 +1445,11 @@ if ! grep -q DISTFILE $pdb/$new_port/+CONTENTS; then
|
|||
test -n "$ds" && ds="${ds}/"
|
||||
|
||||
allfiles=`make $MAKE_ARGS -V ALLFILES`
|
||||
distinfo=`make $MAKE_ARGS -V MD5_FILE`
|
||||
for file in $allfiles; do
|
||||
size=`grep "^SIZE (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
sha256=`grep "^SHA256 (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
md5=`grep "^MD5 (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
size=`grep "^SIZE (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
sha256=`grep "^SHA256 (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
md5=`grep "^MD5 (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
echo "@comment DISTFILE:${ds}${file}:SIZE=${size}:SHA256=${sha256}:MD5=${md5}" >> $pdb/$new_port/+CONTENTS
|
||||
done
|
||||
fi
|
||||
|
|
@ -1526,7 +1562,7 @@ safe_exit
|
|||
|
||||
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Copyright (c) 2005-2006 Douglas Barton
|
||||
# Copyright (c) 2005-2007 Douglas Barton
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Local version: 1.140
|
||||
# Local version: 1.147
|
||||
# $FreeBSD$
|
||||
|
||||
# Copyright (c) 2005-2006 Douglas Barton, All rights reserved
|
||||
# Copyright (c) 2005-2007 Douglas Barton, All rights reserved
|
||||
# Please see detailed copyright below
|
||||
|
||||
trap trap_exit INT
|
||||
|
|
@ -28,11 +28,10 @@ export PATH
|
|||
umask 022
|
||||
|
||||
usage () {
|
||||
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
|
||||
echo "portmaster version $VERSION_NUMBER"
|
||||
echo "portmaster version `grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`"
|
||||
echo ''
|
||||
echo 'Usage:'
|
||||
echo "Common flags: [-CGgnv B|b uf|i D|d] [-m <arguments for make>]"
|
||||
echo "Common flags: [-CGgntv B|b uf|i D|d] [-m <arguments for make>]"
|
||||
echo "${0##*/} [Common flags] <full name of port directory in $pdb>"
|
||||
echo "${0##*/} [Common flags] <full path to $pd/foo/bar>"
|
||||
echo "${0##*/} [Common flags] Multiple full names/paths from $pdb|$pd"
|
||||
|
|
@ -59,6 +58,7 @@ usage () {
|
|||
echo '-b create and keep a backup package of an installed port'
|
||||
echo '-g create a package of the new port'
|
||||
echo '-n do not actually make or install any ports'
|
||||
echo '-t recurse dependencies thoroughly, using all-depends-list'
|
||||
echo '-v verbose output'
|
||||
echo "-u unattended mode -- accept defaults for all but 'make config'"
|
||||
echo '-f always rebuild ports (overrides -i)'
|
||||
|
|
@ -131,6 +131,7 @@ trap_exit () {
|
|||
local pid
|
||||
|
||||
if [ -n "$portdir" ]; then
|
||||
echo ''
|
||||
echo "===>>> Upgrade for $portdir exiting due to signal"
|
||||
else
|
||||
echo "===>>> Exiting due to signal"
|
||||
|
|
@ -484,13 +485,15 @@ ports_by_category () {
|
|||
|
||||
dependency_check () {
|
||||
# Re-use dep_port_list for efficiency
|
||||
local dep_port ign_p cur_p upd_args p op old_p conflicts glob conflict_port
|
||||
local dl_type dep_port ign_p cur_p upd_args p op old_p conflicts glob conflict_port
|
||||
|
||||
# Print a message here because sometimes list generation takes
|
||||
# a long time to return.
|
||||
if [ -z "$dep_port_check_done" ]; then
|
||||
dl_type='build-depends-list run-depends-list'
|
||||
[ -n "$RECURSE_THOROUGH" ] && dl_type=all-depends-list
|
||||
echo "===>>> Gathering dependency list for $portdir from ports"
|
||||
dep_port_list=`make $MAKE_ARGS build-depends-list run-depends-list | sort -u`
|
||||
dep_port_list=`make $MAKE_ARGS $dl_type | sort -u`
|
||||
dep_port_check_done=yes
|
||||
fi
|
||||
|
||||
|
|
@ -645,7 +648,7 @@ find_and_delete_distfiles () {
|
|||
case "$distfiles" in
|
||||
*${file}*)
|
||||
if [ -n "$VERBOSE" -a -z "$do_delete" ]; then
|
||||
echo "===>>> Keeping new distfile: $file"
|
||||
echo "===>>> Keeping current distfile: $file"
|
||||
fi
|
||||
continue # Do not delete current version
|
||||
;;
|
||||
|
|
@ -678,7 +681,15 @@ delete_stale_distfiles () {
|
|||
# we do not delete the current set of distfiles
|
||||
distfiles=`make $MAKE_ARGS -V ALLFILES`
|
||||
|
||||
if [ -d "$distdir" ]; then
|
||||
cd $distdir || fail "cd to $distdir failed!"
|
||||
else
|
||||
echo '' ; echo ''
|
||||
echo "===>>> $distdir does not exist, therefore we"
|
||||
echo " will assume that all relevant distfiles are gone."
|
||||
echo ''
|
||||
return 0
|
||||
fi
|
||||
|
||||
# If these two match, it means that the distfiles in the +CONTENTS
|
||||
# file are the current set, so do not delete them.
|
||||
|
|
@ -713,6 +724,7 @@ delete_all_distfiles () {
|
|||
local DELORNOT
|
||||
|
||||
if ! cd $pd/$1; then
|
||||
echo ''
|
||||
echo "===>>> No $pd/$1 to cd to in order to delete"
|
||||
echo " old distfiles, remove by hand if desired"
|
||||
else
|
||||
|
|
@ -737,8 +749,10 @@ delete_all_distfiles () {
|
|||
}
|
||||
|
||||
backup_package () {
|
||||
# pkgrep and bu_pkg_name are used globally
|
||||
|
||||
echo "===>>> Creating a backup package for old version $1"
|
||||
pkg_create -b $1 || fail "Backup package creation failed for $1"
|
||||
if pkg_create -b $1; then
|
||||
[ -z "$pkgrep" ] &&
|
||||
pkgrep=`make $MAKE_ARGS -f $pd/Mk/bsd.port.mk -V PKGREPOSITORY`
|
||||
if [ ! -d "$pkgrep" ]; then
|
||||
|
|
@ -747,6 +761,25 @@ backup_package () {
|
|||
bu_pkg_name=`echo ${1}.*`
|
||||
mv $bu_pkg_name $pkgrep/ &&
|
||||
echo " ===>>> Package can be found in $pkgrep"
|
||||
else
|
||||
local PROCEED
|
||||
|
||||
if [ -z "$UNATTENDED" ]; then
|
||||
echo ''
|
||||
echo "===>>> Backup package creation failed for ${1}!"
|
||||
echo ''
|
||||
echo "===>>> Ignore this error [i]"
|
||||
echo "===>>> Abort update [a]"
|
||||
echo ''
|
||||
echo -n "===>>> How would you like to proceed? [i] "
|
||||
read PROCEED
|
||||
case "$PROCEED" in
|
||||
a) fail "Backup package creation failed for $1" ;;
|
||||
esac
|
||||
else
|
||||
fail "Backup package creation failed for $1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pd=`make $MAKE_ARGS -f/dev/null -V PORTSDIR 2>/dev/null`
|
||||
|
|
@ -767,7 +800,7 @@ fi
|
|||
: ${pdb:=/var/db/pkg}
|
||||
|
||||
# Save switches for potential child processes
|
||||
while getopts 'BCDGLabde:fghilm:nop:r:suv' COMMAND_LINE_ARGUMENT ; do
|
||||
while getopts 'BCDGLabde:fghilm:nop:r:stuv' COMMAND_LINE_ARGUMENT ; do
|
||||
case "${COMMAND_LINE_ARGUMENT}" in
|
||||
B) NO_BACKUP=yes; ARGS="-B $ARGS" ;;
|
||||
C) DONT_PRE_CLEAN=yes; ARGS="-C $ARGS" ;;
|
||||
|
|
@ -795,6 +828,7 @@ while getopts 'BCDGLabde:fghilm:nop:r:suv' COMMAND_LINE_ARGUMENT ; do
|
|||
p) portdir="${OPTARG#$pd/}" ;;
|
||||
r) UPDATE_REQ_BYS=yes; upg_port=$OPTARG ;;
|
||||
s) CLEAN_STALE=yes ;;
|
||||
t) RECURSE_THOROUGH=yes; ARGS="-t $ARGS" ;;
|
||||
u) UNATTENDED=yes; ARGS="-u $ARGS" ;;
|
||||
v) VERBOSE=yes; ARGS="-v $ARGS" ;;
|
||||
*) usage ;;
|
||||
|
|
@ -1172,11 +1206,11 @@ fi
|
|||
|
||||
cd $pd/$portdir || usage
|
||||
|
||||
for state in FORBIDDEN IGNORE BROKEN; do
|
||||
for state in FORBIDDEN BROKEN IGNORE; do
|
||||
state_set=`make -V $state`
|
||||
if [ -n "$state_set" ]; then
|
||||
echo "===>>> This port is marked $state:"
|
||||
echo "===>>> $portdir $state_set"
|
||||
echo "===>>> $state_set"
|
||||
echo "===>>> If you are sure you can build it, remove the"
|
||||
echo " $state line in the Makefile and try again."
|
||||
safe_exit 1
|
||||
|
|
@ -1331,11 +1365,12 @@ short_port="${prefix}${portname}${suffix}"
|
|||
# Check for dependencies here in case +REQUIRED_BY is not up to date or missing
|
||||
grep_deps=`mktemp -t grep-deps-${short_port}`
|
||||
|
||||
upg_origin=$portdir
|
||||
if [ -n "$upg_port" ]; then
|
||||
upg_origin=`origin_from_pdb $pdb/$upg_port`
|
||||
grep -l DEPORIGIN:$upg_origin$ $pdb/*/+CONTENTS | cut -f 5 -d '/' |
|
||||
sort -u > $grep_deps
|
||||
fi
|
||||
grep -l DEPORIGIN:$upg_origin$ $pdb/*/+CONTENTS | cut -f 5 -d '/' |
|
||||
sort -u > $grep_deps
|
||||
|
||||
if [ -s "$pdb/$upg_port/+REQUIRED_BY" ]; then
|
||||
req_deps=`mktemp -t req-deps-${short_port}`
|
||||
|
|
@ -1410,10 +1445,11 @@ if ! grep -q DISTFILE $pdb/$new_port/+CONTENTS; then
|
|||
test -n "$ds" && ds="${ds}/"
|
||||
|
||||
allfiles=`make $MAKE_ARGS -V ALLFILES`
|
||||
distinfo=`make $MAKE_ARGS -V MD5_FILE`
|
||||
for file in $allfiles; do
|
||||
size=`grep "^SIZE (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
sha256=`grep "^SHA256 (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
md5=`grep "^MD5 (${ds}${file})" distinfo | cut -f4 -d' '`
|
||||
size=`grep "^SIZE (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
sha256=`grep "^SHA256 (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
md5=`grep "^MD5 (${ds}${file})" $distinfo | cut -f4 -d' '`
|
||||
echo "@comment DISTFILE:${ds}${file}:SIZE=${size}:SHA256=${sha256}:MD5=${md5}" >> $pdb/$new_port/+CONTENTS
|
||||
done
|
||||
fi
|
||||
|
|
@ -1526,7 +1562,7 @@ safe_exit
|
|||
|
||||
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Copyright (c) 2005-2006 Douglas Barton
|
||||
# Copyright (c) 2005-2007 Douglas Barton
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
|
|
|||
Loading…
Reference in a new issue