Merge branch 'master' into check
This commit is contained in:
commit
33c1040159
1073 changed files with 80740 additions and 22476 deletions
6
xbps-src
6
xbps-src
|
@ -418,7 +418,7 @@ XBPS_OPTIONS=
|
|||
XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:qr:tV"
|
||||
|
||||
# Preprocess arguments in order to allow options before and after XBPS_TARGET.
|
||||
eval set -- $(getopt -- "$XBPS_OPTSTRING" "$@");
|
||||
eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
|
||||
|
||||
while getopts "$XBPS_OPTSTRING" opt; do
|
||||
case $opt in
|
||||
|
@ -428,12 +428,12 @@ while getopts "$XBPS_OPTSTRING" opt; do
|
|||
f) readonly XBPS_BUILD_FORCEMODE=1; XBPS_OPTIONS+=" -f";;
|
||||
G) readonly XBPS_USE_GIT_REVS=1; XBPS_OPTIONS+=" -G";;
|
||||
g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";;
|
||||
H) readonly XBPS_HOSTDIR="$(readlink -m $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";;
|
||||
H) readonly XBPS_HOSTDIR="$(readlink -f $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";;
|
||||
h) usage && exit 0;;
|
||||
I) readonly XBPS_SKIP_DEPS=1; XBPS_OPTIONS+=" -I";;
|
||||
j) export XBPS_MAKEJOBS="$OPTARG"; XBPS_OPTIONS+=" -j $OPTARG";;
|
||||
L) export NOCOLORS=1; XBPS_OPTIONS+=" -L";;
|
||||
m) readonly XBPS_MASTERDIR=$(readlink -m $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";;
|
||||
m) readonly XBPS_MASTERDIR=$(readlink -f $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";;
|
||||
N) readonly XBPS_SKIP_REMOTEREPOS=1; XBPS_OPTIONS+=" -N";;
|
||||
o) readonly XBPS_PKG_OPTIONS="$OPTARG"; XBPS_OPTIONS+=" -o $OPTARG";;
|
||||
q) export XBPS_CHECK_PKGS=0; XBPS_OPTIONS+=" -q";;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue