Evolinx/bottle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BOTTLE: Change behaviour how makepkg now works

Browse Source 
* 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:
Martin Valba 2024-09-28 22:01:45 +03:00
parent b7415dca13
commit 4b49862898
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/makepkg.sh.in
View File

@ -73,8 +73,8 @@ PREPAREFUNC=0
REPKG=0 REPKG=0
REPRODUCIBLE=0 REPRODUCIBLE=0
RMDEPS=0 RMDEPS=0
SKIPCHECKSUMS=0 SKIPCHECKSUMS=1
SKIPPGPCHECK=0 SKIPPGPCHECK=1
SIGNPKG='' SIGNPKG=''
SPLITPKG=0 SPLITPKG=0
SOURCEONLY=0 SOURCEONLY=0
@ -909,9 +909,9 @@ usage() {
printf -- "$(gettext " --packagelist Only list package filepaths that would be produced")\n" printf -- "$(gettext " --packagelist Only list package filepaths that would be produced")\n"
printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n"
printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" 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 " --withchecksums Verify checksums of the source files")\n"
printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" printf -- "$(gettext " --withinteg Perform any verification checks on source files")\n"
printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n" printf -- "$(gettext " --withpgpcheck Verify source files with PGP signatures")\n"
printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n"
echo echo
printf -- "$(gettext "These options can be passed to %s:")\n" "bottle" 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' OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'dir:' 'force' 'geninteg'
'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild'
'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist'
'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'withchecksums' 'withinteg'
'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') 'withpgpcheck' 'source' 'syncdeps' 'verifysource' 'version')
# Bottle Options # Bottle Options
OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar')
@ -1005,9 +1005,9 @@ while true; do
-r|--rmdeps) RMDEPS=1 ;; -r|--rmdeps) RMDEPS=1 ;;
-R|--repackage) REPKG=1 ;; -R|--repackage) REPKG=1 ;;
--sign) SIGNPKG='y' ;; --sign) SIGNPKG='y' ;;
--skipchecksums) SKIPCHECKSUMS=1 ;; --withchecksums) SKIPCHECKSUMS=0 ;;
--skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; --withinteg) SKIPCHECKSUMS=0; SKIPPGPCHECK=0 ;;
--skippgpcheck) SKIPPGPCHECK=1;; --withpgpcheck) SKIPPGPCHECK=0 ;;
-s|--syncdeps) DEP_BIN=1 ;; -s|--syncdeps) DEP_BIN=1 ;;
-S|--source) BUILDPKG=0 SOURCEONLY=1 ;; -S|--source) BUILDPKG=0 SOURCEONLY=1 ;;
--verifysource) BUILDPKG=0 VERIFYSOURCE=1 ;; --verifysource) BUILDPKG=0 VERIFYSOURCE=1 ;;