BOTTLE: Change behaviour how makepkg now works
* skipinteg -> withinteg * skippgpcheck -> withpgpcheck * skipchecksums -> withchecksums * Also pgp, checksum and integ checks are disabled by default ( Forcing someone to add extra checks is pointless from my view )
This commit is contained in:
parent
b7415dca13
commit
4b49862898
@ -73,8 +73,8 @@ PREPAREFUNC=0
|
||||
REPKG=0
|
||||
REPRODUCIBLE=0
|
||||
RMDEPS=0
|
||||
SKIPCHECKSUMS=0
|
||||
SKIPPGPCHECK=0
|
||||
SKIPCHECKSUMS=1
|
||||
SKIPPGPCHECK=1
|
||||
SIGNPKG=''
|
||||
SPLITPKG=0
|
||||
SOURCEONLY=0
|
||||
@ -909,9 +909,9 @@ usage() {
|
||||
printf -- "$(gettext " --packagelist Only list package filepaths that would be produced")\n"
|
||||
printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n"
|
||||
printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg"
|
||||
printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n"
|
||||
printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n"
|
||||
printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n"
|
||||
printf -- "$(gettext " --withchecksums Verify checksums of the source files")\n"
|
||||
printf -- "$(gettext " --withinteg Perform any verification checks on source files")\n"
|
||||
printf -- "$(gettext " --withpgpcheck Verify source files with PGP signatures")\n"
|
||||
printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n"
|
||||
echo
|
||||
printf -- "$(gettext "These options can be passed to %s:")\n" "bottle"
|
||||
@ -954,8 +954,8 @@ OPT_SHORT="AcCdD:efFghiLmop:rRsSV"
|
||||
OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'dir:' 'force' 'geninteg'
|
||||
'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild'
|
||||
'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist'
|
||||
'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg'
|
||||
'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version')
|
||||
'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'withchecksums' 'withinteg'
|
||||
'withpgpcheck' 'source' 'syncdeps' 'verifysource' 'version')
|
||||
|
||||
# Bottle Options
|
||||
OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar')
|
||||
@ -969,8 +969,8 @@ unset OPT_SHORT OPT_LONG OPTRET
|
||||
while true; do
|
||||
case "$1" in
|
||||
# Bottle Options
|
||||
--asdeps) ASDEPS=1;;
|
||||
--needed) NEEDED=1;;
|
||||
--asdeps) ASDEPS=1 ;;
|
||||
--needed) NEEDED=1 ;;
|
||||
--noconfirm) PACMAN_OPTS+=("--noconfirm") ;;
|
||||
--noprogressbar) PACMAN_OPTS+=("--noprogressbar") ;;
|
||||
|
||||
@ -987,7 +987,7 @@ while true; do
|
||||
-f|--force) FORCE=1 ;;
|
||||
-F) INFAKEROOT=1 ;;
|
||||
# generating integrity checks does not depend on architecture
|
||||
-g|--geninteg) BUILDPKG=0 GENINTEG=1 IGNOREARCH=1;;
|
||||
-g|--geninteg) BUILDPKG=0 GENINTEG=1 IGNOREARCH=1 ;;
|
||||
--holdver) HOLDVER=1 ;;
|
||||
-i|--install) INSTALL=1 ;;
|
||||
--key) shift; GPGKEY=$1 ;;
|
||||
@ -1000,14 +1000,14 @@ while true; do
|
||||
--nosign) SIGNPKG='n' ;;
|
||||
-o|--nobuild) BUILDPKG=0 NOBUILD=1 ;;
|
||||
-p) shift; BUILDFILE=$1 ;;
|
||||
--packagelist) BUILDPKG=0 PACKAGELIST=1 IGNOREARCH=1;;
|
||||
--printsrcinfo) BUILDPKG=0 PRINTSRCINFO=1 IGNOREARCH=1;;
|
||||
--packagelist) BUILDPKG=0 PACKAGELIST=1 IGNOREARCH=1 ;;
|
||||
--printsrcinfo) BUILDPKG=0 PRINTSRCINFO=1 IGNOREARCH=1 ;;
|
||||
-r|--rmdeps) RMDEPS=1 ;;
|
||||
-R|--repackage) REPKG=1 ;;
|
||||
--sign) SIGNPKG='y' ;;
|
||||
--skipchecksums) SKIPCHECKSUMS=1 ;;
|
||||
--skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;;
|
||||
--skippgpcheck) SKIPPGPCHECK=1;;
|
||||
--withchecksums) SKIPCHECKSUMS=0 ;;
|
||||
--withinteg) SKIPCHECKSUMS=0; SKIPPGPCHECK=0 ;;
|
||||
--withpgpcheck) SKIPPGPCHECK=0 ;;
|
||||
-s|--syncdeps) DEP_BIN=1 ;;
|
||||
-S|--source) BUILDPKG=0 SOURCEONLY=1 ;;
|
||||
--verifysource) BUILDPKG=0 VERIFYSOURCE=1 ;;
|
||||
|
Loading…
Reference in New Issue
Block a user