jmq/Documentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgmeek: made it easier to update signature after editing the Pkgfile

Browse Source
This commit is contained in:
John McQuah 2022-06-13 16:58:27 -04:00
parent 8dac60ee7b
commit 5a0d76543f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/pkgmeek
View File

@ -28,7 +28,7 @@ fi
# Read the Pkgfile to determine what to do next. But first ensure that # Read the Pkgfile to determine what to do next. But first ensure that
# it came from a trusted source (FS#1851) # it came from a trusted source (FS#1851)
# #
validate_pkgfile || exit $E_PKGFILE [ "$PKGMK_UPDATE_SIG" = "yes" ] || validate_pkgfile || exit $E_PKGFILE
[ -f .32bit ] && PGKMK_ARCH=32 || PKGMK_ARCH=64 [ -f .32bit ] && PGKMK_ARCH=32 || PKGMK_ARCH=64
. "Pkgfile"; . "$PKGMK_CONF"; set -e . "Pkgfile"; . "$PKGMK_CONF"; set -e
@ -69,7 +69,7 @@ here="${_local_[$u]}"; url="${source[$u]}";
# appropriate name in the current directory # appropriate name in the current directory
[ -e "$here" ] || [ "$src_dir" = "" ] || [ ! -e "$src_dir/$here" ] || ln -sf "$src_dir/$here" ; [ -e "$here" ] || [ "$src_dir" = "" ] || [ ! -e "$src_dir/$here" ] || ln -sf "$src_dir/$here" ;
[ -e "$here" ] || [ ! -e "$PKGMK_ROOT/$here" ] || ln -sf "$PKGMK_ROOT/$here" . ; [ -e "$here" ] || [ ! -e "$PKGMK_ROOT/$here" ] || ln -sf "$PKGMK_ROOT/$here" . ;
[ -e "$here" ] || fetch_source "$url" "$here"; # <-- should also be able to resume partial downloads [ -e "$here" ] || fetch_url "$url" "$here"; # <-- should also be able to resume partial downloads
[ -e "$here" ] || { error "failed to download $here. Check connection and try again."; errDL+=1; } [ -e "$here" ] || { error "failed to download $here. Check connection and try again."; errDL+=1; }
done ; } done ; }
@ -357,7 +357,7 @@ check_pkg_mtime() { # can be called even if some sources are missing
info "$msg"; return $utd info "$msg"; return $utd
} }
fetch_source() { fetch_url() {
local u="$1"; local h="$2"; local finished=0; local gitsrc tag CLONE_ARGS local u="$1"; local h="$2"; local finished=0; local gitsrc tag CLONE_ARGS
local REPO SAVE_AS OCONTINUE OOUT; local m=0 local REPO SAVE_AS OCONTINUE OOUT; local m=0
[ -x "$PKGMK_GIT_COMMAND" ] || PKGMK_GIT_COMMAND="/bin/false" [ -x "$PKGMK_GIT_COMMAND" ] || PKGMK_GIT_COMMAND="/bin/false"
@ -398,16 +398,16 @@ fetch_source() {
m=$(( m+1 )) m=$(( m+1 ))
# interrupted downloads from a previous run should be put where wget or curl will find them # interrupted downloads from a previous run should be put where wget or curl will find them
[ -s "$src_dir/$h.partial" ] && { ln -s "$src_dir/$h.partial" . ; [ -f "$src_dir/$h.partial" ] && { ln -s "$src_dir/$h.partial" . ;
SAVE_AS="$PKGMK_DOWNLOAD_PROG $um $OCONTINUE $OOUT"; } \ SAVE_AS="$PKGMK_DOWNLOAD_PROG $um $OCONTINUE $OOUT"; } \
|| SAVE_AS="$PKGMK_DOWNLOAD_PROG $um $OOUT" || SAVE_AS="$PKGMK_DOWNLOAD_PROG $um $OOUT"
if $SAVE_AS "$h.partial"; then if $SAVE_AS "$h.partial"; then
finished=1 finished=1
[ "$src_dir" = "" ] || [ ! -w "$src_dir"/ ] || { mv "$h.partial" "$src_dir/$h"; [ "$src_dir" = "" ] || [ ! -w "$src_dir"/ ] || \
ln -sf "$src_dir/$h" . ; } { mv "$h.partial" "$src_dir/$h"; ln -sf "$src_dir/$h" . ; }
else # an interrupted download should not have its efforts destroyed by cleanup_work() else # an interrupted download should not have its efforts destroyed by cleanup_work()
[ ! -e "$h.partial" ] || [ "$src_dir" = "" ] || [ ! -w "$src_dir"/ ] \ [ ! -s "$h.partial" ] || [ "$src_dir" = "" ] || [ ! -w "$src_dir"/ ] \
|| mv "$h.partial" "$src_dir" || mv "$h.partial" "$src_dir"
fi fi
done done
@ -519,7 +519,8 @@ cat_signature() {
for f in "$PKGMK_ROOT/Pkgfile" "$PKGMK_ROOT/.footprint"; do for f in "$PKGMK_ROOT/Pkgfile" "$PKGMK_ROOT/.footprint"; do
[ -e $f ] && ordered+=( "$f" ) [ -e $f ] && ordered+=( "$f" )
done done
for ((si=0; si < ${#source[@]}; si++)); do ordered+=("${_local_[$si]}"); done for ((si=0; si < ${#source[@]}; si++)); do
[[ ${source[$si]} =~ ^(http|https|ssh|git)://.+/.+\.git($|#.*) ]] || ordered+=("${_local_[$si]}"); done
sha256sum --tag "${ordered[@]}" \ sha256sum --tag "${ordered[@]}" \
| sed 's|^SHA256 (.*/\(.*\))\(.* = .*\)|SHA256 (\1)\2|' \ | sed 's|^SHA256 (.*/\(.*\))\(.* = .*\)|SHA256 (\1)\2|' \
| /usr/bin/signify -S -e -x - -q -s "$key" -m - \ | /usr/bin/signify -S -e -x - -q -s "$key" -m - \
@ -582,7 +583,7 @@ error() {
######################## end of subroutines ########################### ######################## end of subroutines ###########################
## Now ensure that they cannot be overwritten when sourcing Pkgfile ## ## Now ensure that they cannot be overwritten when sourcing Pkgfile ##
readonly -f main info warning error print_help parse_options validate_pkgfile \ readonly -f main info warning error print_help parse_options validate_pkgfile \
check_reqvars check_pkg_mtime fetch_source cat_manifest check_manifest \ check_reqvars check_pkg_mtime fetch_url cat_manifest check_manifest \
cat_signature check_signature parse_signify_output refresh_signature \ cat_signature check_signature parse_signify_output refresh_signature \
cleanup_work recursive cleanup_work recursive